Skip to content

Commit 7c7d837

Browse files
committedNov 12, 2013
[globe] Re-Enable sync extent button and disable home button
The home button was a duplicate of the globe in the center of the navigation arrows
1 parent 4fd011f commit 7c7d837

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
 

‎src/plugins/globe/globe_plugin.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,26 +663,29 @@ void GlobePlugin::setupControls()
663663
mControlCanvas->addControl( backgroundGrp2 );
664664

665665
//Zoom Reset
666+
#if ENABLE_HOME_BUTTON
666667
osg::Image* homeImg = osgDB::readImageFile( imgDir + "/zoom-home.png" );
667668
ImageControl* home = new NavigationControl( homeImg );
668669
home->setPosition( imgLeft + 12 + 3, imgTop + 2 );
670+
imgTop = imgTop + 23 + 2;
669671
home->addEventHandler( new HomeControlHandler( manip ) );
670672
mControlCanvas->addControl( home );
673+
#endif
671674

672675
//refresh layers
673676
osg::Image* refreshImg = osgDB::readImageFile( imgDir + "/refresh-view.png" );
674677
ImageControl* refresh = new NavigationControl( refreshImg );
675-
refresh->setPosition( imgLeft + 12 + 3, imgTop + 2 + 23 + 2 );
678+
refresh->setPosition( imgLeft + 12 + 3, imgTop + 3 );
679+
imgTop = imgTop + 23 + 2;
676680
refresh->addEventHandler( new RefreshControlHandler( this ) );
677681
mControlCanvas->addControl( refresh );
678682

679683
//Sync Extent
680-
#if ENABLE_SYNC_BUTTON
681684
osg::Image* syncImg = osgDB::readImageFile( imgDir + "/sync-extent.png" );
682685
ImageControl* sync = new NavigationControl( syncImg );
686+
sync->setPosition( imgLeft + 12 + 3, imgTop + 2 );
683687
sync->addEventHandler( new SyncExtentControlHandler( this ) );
684688
mControlCanvas->addControl( sync );
685-
#endif
686689
}
687690

688691
void GlobePlugin::setupProxy()
-1.02 KB
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.