fixed homeHandler

qgis · Dec 1, 2010 · b0f3d4e05a81be546f2e3b2178f9589194142d4c · b0f3d4e
1 parent 7a96956
commit b0f3d4e05a81be546f2e3b2178f9589194142d4c
Unified Split

Showing with 12 additions and 6 deletions.

+9 −5 src/plugins/globe/globe_plugin.cpp

+3 −1 src/plugins/globe/globe_plugin.h
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -259,7 +259,7 @@ void GlobePlugin::setupMap()
 struct PanControlHandler : public NavigationControlHandler
 {
     PanControlHandler( osgEarthUtil::EarthManipulator* manip, double dx, double dy ) : _manip( manip ), _dx( dx ), _dy( dy ) { }
-    virtual void onMouseDown( Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa  )
+    virtual void onMouseDown( Control* control, int mouseButtonMask )
     {
       _manip->pan( _dx, _dy );
     }
@@ -272,7 +272,7 @@ struct PanControlHandler : public NavigationControlHandler
 struct RotateControlHandler : public NavigationControlHandler
 {
     RotateControlHandler( osgEarthUtil::EarthManipulator* manip, double dx, double dy ) : _manip( manip ), _dx( dx ), _dy( dy ) { }
-    virtual void onMouseDown( Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa  )
+    virtual void onMouseDown( Control* control, int mouseButtonMask )
     {
       if( 0 == _dx && 0 == _dy )
       {
@@ -292,7 +292,7 @@ struct RotateControlHandler : public NavigationControlHandler
 struct ZoomControlHandler : public NavigationControlHandler
 {
     ZoomControlHandler( osgEarthUtil::EarthManipulator* manip, double dx, double dy ) : _manip( manip ), _dx( dx ), _dy( dy ) { }
-    virtual void onMouseDown( Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa  )
+    virtual void onMouseDown( Control* control, int mouseButtonMask )
     {
       _manip->zoom( _dx, _dy );
     }
@@ -305,7 +305,7 @@ struct ZoomControlHandler : public NavigationControlHandler
 struct HomeControlHandler : public NavigationControlHandler
 {
     HomeControlHandler( osgEarthUtil::EarthManipulator* manip ) : _manip( manip ) { }
-    virtual void onMouseDown( Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa )
+    virtual void onClick( Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa )
     {
       _manip->home( ea, aa );
     }
@@ -696,7 +696,11 @@ bool NavigationControl::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActi
     for( ControlEventHandlerList::const_iterator i = _eventHandlers.begin(); i != _eventHandlers.end(); ++i )
     {
       NavigationControlHandler* handler = dynamic_cast<NavigationControlHandler*>( i->get() );
-      if( handler ) handler->onMouseDown( this, ea.getButtonMask(), ea, aa );
+      if( handler )
+      {
+        handler->onMouseDown( this, ea.getButtonMask() );
+        handler->onClick( this, ea.getButtonMask(), ea, aa );
+      }
     }
   }
   return Control::handle( ea, aa, cx );

diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h
@@ -123,6 +123,7 @@ class FlyToExtentHandler : public osgGA::GUIEventHandler
   GlobePlugin* mGlobe;
 };
 
+
 class KeyboardControlHandler : public osgGA::GUIEventHandler
 {
   public:
@@ -144,7 +145,8 @@ namespace osgEarthUtil
     class NavigationControlHandler : public ControlEventHandler
     {
       public:
-        virtual void onMouseDown( class Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) { }
+        virtual void onMouseDown( class Control* control, int mouseButtonMask ) { }
+        virtual void onClick( class Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) { }
     };
 
     class NavigationControl : public ImageControl