Removed unnecessary mouseMoveEvent reimplementation from IndicatorButton class.

[situare] / src / ui / zoombuttonpanel.cpp

diff --git a/src/ui/zoombuttonpanel.cpp b/src/ui/zoombuttonpanel.cpp
index 970b3cd..67dfba7 100644 (file)
--- a/src/ui/zoombuttonpanel.cpp
+++ b/src/ui/zoombuttonpanel.cpp
@@ -160,14 +160,14 @@ void ZoomButtonPanel::paintEvent(QPaintEvent *event)
     }
 }
 
-const ZoomButton* ZoomButtonPanel::zoomInButton()
+const ZoomButton* ZoomButtonPanel::zoomInButton() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
     return m_zoomInButton;
 }
 
-const ZoomButton* ZoomButtonPanel::zoomOutButton()
+const ZoomButton* ZoomButtonPanel::zoomOutButton() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -178,22 +178,22 @@ void ZoomButtonPanel::disableZoomInButton()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_zoomInButton->setMode(QIcon::Disabled);
+    m_zoomInButton->setEnabled(false);
 }
 
 void ZoomButtonPanel::disableZoomOutButton()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_zoomOutButton->setMode(QIcon::Disabled);
+    m_zoomOutButton->setEnabled(false);
 }
 
 void ZoomButtonPanel::resetButtons()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_zoomInButton->setMode(QIcon::Normal);
-    m_zoomOutButton->setMode(QIcon::Normal);
+    m_zoomInButton->setEnabled(true);
+    m_zoomOutButton->setEnabled(true);
 }
 
 void ZoomButtonPanel::setDraggable(bool mode, QPoint eventPosition)
@@ -205,29 +205,24 @@ void ZoomButtonPanel::setDraggable(bool mode, QPoint eventPosition)
     if(mode) {
         emit draggingModeTriggered();
 
-        m_zoomInMode = m_zoomInButton->mode();
-        m_zoomOutMode = m_zoomOutButton->mode();
-        m_zoomInButton->setMode(QIcon::Disabled);
-        m_zoomOutButton->setMode(QIcon::Disabled);
+        m_zoomInMode = m_zoomInButton->isEnabled();
+        m_zoomOutMode = m_zoomOutButton->isEnabled();
+
+        m_zoomInButton->setEnabled(false);
+        m_zoomOutButton->setEnabled(false);
 
         grabMouse();
 
         m_forceReleaseTimer->start();
         m_dragPosition = eventPosition;
     } else {
-        if(m_zoomInMode == QIcon::Selected)
-            m_zoomInButton->setMode(QIcon::Normal);
-        else
-            m_zoomInButton->setMode(m_zoomInMode);
-
-        if(m_zoomOutMode == QIcon::Selected)
-            m_zoomOutButton->setMode(QIcon::Normal);
-        else
-            m_zoomOutButton->setMode(m_zoomOutMode);
+        m_zoomInButton->setEnabled(m_zoomInMode);
+        m_zoomOutButton->setEnabled(m_zoomOutMode);
 
         releaseMouse();
 
         m_forceReleaseTimer->stop();
+
         m_zoomInButton->setDown(false);
         m_zoomOutButton->setDown(false);
     }