@@ -379,13 +379,13 @@ void GlobePlugin::setupControls()
379379 // Horizontal container
380380 HBox* moveHControls = new HBox ();
381381 moveHControls->setFrame ( new RoundedFrame () );
382- // moveHControls->getFrame()->setBackColor(0.5,0.5,0.5 ,0.1 );
383- moveHControls->setMargin ( 10 );
384- moveHControls->setSpacing ( 15 );
382+ moveHControls->getFrame ()->setBackColor (1 , 1 , 1 ,0.5 );
383+ moveHControls->setMargin ( 0 );
384+ moveHControls->setSpacing ( 47 );
385385 moveHControls->setVertAlign ( Control::ALIGN_CENTER );
386386 moveHControls->setHorizAlign ( Control::ALIGN_CENTER );
387- moveHControls->setPosition ( 20 , 26 );
388- moveHControls->setPadding ( 3 );
387+ moveHControls->setPosition ( 5 , 30 );
388+ moveHControls->setPadding ( 6 );
389389
390390 osgEarthUtil::EarthManipulator* manip = dynamic_cast <osgEarthUtil::EarthManipulator*>( viewer.getCameraManipulator () );
391391 // Move Left
@@ -401,13 +401,13 @@ void GlobePlugin::setupControls()
401401 // Vertical container
402402 VBox* moveVControls = new VBox ();
403403 moveVControls->setFrame ( new RoundedFrame () );
404- // moveVControls->getFrame()->setBackColor(0.5,0.5,0.5 ,0.1 );
405- moveVControls->setMargin ( 10 );
406- moveVControls->setSpacing ( 20 );
404+ moveVControls->getFrame ()->setBackColor (1 , 1 , 1 ,0.5 );
405+ moveVControls->setMargin ( 0 );
406+ moveVControls->setSpacing ( 36 );
407407 moveVControls->setVertAlign ( Control::ALIGN_CENTER );
408408 moveVControls->setHorizAlign ( Control::ALIGN_CENTER );
409- moveVControls->setPosition ( 40 , 5 );
410- moveVControls->setPadding ( 3 );
409+ moveVControls->setPosition ( 35 , 5 );
410+ moveVControls->setPadding ( 6 );
411411
412412 // Move Up
413413 osg::Image* moveUpImg = osgDB::readImageFile ( imgDir + " /move-up.png"
@@ -431,13 +431,13 @@ void GlobePlugin::setupControls()
431431 // Horizontal container
432432 HBox* rotateControls = new HBox ();
433433 rotateControls->setFrame ( new RoundedFrame () );
434- // rotateControls->getFrame()->setBackColor(0.5,0.5,0.5 ,0.1 );
435- rotateControls->setMargin ( 10 );
434+ rotateControls->getFrame ()->setBackColor (1 , 1 , 1 ,0.5 );
435+ rotateControls->setMargin ( 0 );
436436 rotateControls->setSpacing ( 10 );
437437 rotateControls->setVertAlign ( Control::ALIGN_CENTER );
438438 rotateControls->setHorizAlign ( Control::ALIGN_CENTER );
439- rotateControls->setPosition ( 5 , 120 );
440- rotateControls->setPadding ( 3 );
439+ rotateControls->setPosition ( 5 , 113 );
440+ rotateControls->setPadding ( 6 );
441441
442442 // Rotate CCW
443443 osg::Image* rotateCCWImg = osgDB::readImageFile ( imgDir + " /rotate-ccw.png"
@@ -465,13 +465,13 @@ void GlobePlugin::setupControls()
465465 // Vertical container
466466 VBox* tiltControls = new VBox ();
467467 tiltControls->setFrame ( new RoundedFrame () );
468- // tiltControls->getFrame()->setBackColor(0.5,0.5,0.5 ,0.1 );
469- tiltControls->setMargin ( 10 );
468+ tiltControls->getFrame ()->setBackColor (1 , 1 , 1 ,0.5 );
469+ tiltControls->setMargin ( 0 );
470470 tiltControls->setSpacing ( 30 );
471471 tiltControls->setVertAlign ( Control::ALIGN_CENTER );
472472 tiltControls->setHorizAlign ( Control::ALIGN_CENTER );
473- tiltControls->setPosition ( 40 , 90 );
474- tiltControls->setPadding ( 3 );
473+ tiltControls->setPosition ( 35 , 90 );
474+ tiltControls->setPadding ( 6 );
475475
476476 // tilt Up
477477 osg::Image* tiltUpImg = osgDB::readImageFile ( imgDir + " /tilt-up.png"
@@ -493,13 +493,13 @@ void GlobePlugin::setupControls()
493493 // Vertical container
494494 VBox* zoomControls = new VBox ();
495495 zoomControls->setFrame ( new RoundedFrame () );
496- // zoomControls->getFrame()->setBackColor(0.5,0.5,0.5 ,0.1 );
497- zoomControls->setMargin ( 10 );
498- zoomControls->setSpacing ( 0 );
496+ zoomControls->getFrame ()->setBackColor (1 , 1 , 1 ,0.5 );
497+ zoomControls->setMargin ( 0 );
498+ zoomControls->setSpacing ( 5 );
499499 zoomControls->setVertAlign ( Control::ALIGN_CENTER );
500500 zoomControls->setHorizAlign ( Control::ALIGN_CENTER );
501- zoomControls->setPosition ( 40 , 180 );
502- zoomControls->setPadding ( 3 );
501+ zoomControls->setPosition ( 35 , 170 );
502+ zoomControls->setPadding ( 6 );
503503
504504 // Zoom In
505505 osg::Image* zoomInImg = osgDB::readImageFile ( imgDir + " /zoom-in.png"
@@ -521,13 +521,13 @@ void GlobePlugin::setupControls()
521521 // Horizontal container
522522 HBox* extraControls = new HBox ();
523523 extraControls->setFrame ( new RoundedFrame () );
524- // extraControls->getFrame()->setBackColor(0.5,0.5,0.5 ,0.1 );
525- extraControls->setMargin ( 10 );
524+ extraControls->getFrame ()->setBackColor (1 , 1 , 1 ,0.5 );
525+ extraControls->setMargin ( 0 );
526526 extraControls->setSpacing ( 10 );
527527 extraControls->setVertAlign ( Control::ALIGN_CENTER );
528528 extraControls->setHorizAlign ( Control::ALIGN_CENTER );
529- extraControls->setPosition ( 5 , 240 );
530- extraControls->setPadding ( 3 );
529+ extraControls->setPosition ( 5 , 220 );
530+ extraControls->setPadding ( 6 );
531531
532532 // Sync Extent
533533 osg::Image* extraSyncImg = osgDB::readImageFile ( imgDir + " /sync-extent.png"
@@ -552,10 +552,10 @@ void GlobePlugin::setupControls()
552552// END EXTRA CONTROLS
553553
554554// add controls groups to canavas
555- mControlCanvas ->addControl ( moveVControls );
556555 mControlCanvas ->addControl ( moveHControls );
557- mControlCanvas ->addControl ( rotateControls );
556+ mControlCanvas ->addControl ( moveVControls );
558557 mControlCanvas ->addControl ( tiltControls );
558+ mControlCanvas ->addControl ( rotateControls );
559559 mControlCanvas ->addControl ( zoomControls );
560560 mControlCanvas ->addControl ( extraControls );
561561
0 commit comments