fixed issue that the zoom slider tooltip showed the previous size when changing the...

svn path=/trunk/KDE/kdebase/apps/; revision=906188

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 9d25eb1036bcf3de9b621e596b0980178f6b12bc..caa784049e654be149aa05f5a2c5b304f422b12b 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -74,7 +74,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     const int max = ZoomLevelInfo::maximumLevel();
     m_zoomSlider->setRange(min, max);
     m_zoomSlider->setValue(view->zoomLevel());
     const int max = ZoomLevelInfo::maximumLevel();
     m_zoomSlider->setRange(min, max);
     m_zoomSlider->setValue(view->zoomLevel());

-    updateZoomSliderToolTip();
+    updateZoomSliderToolTip(view->zoomLevel());

 
     m_zoomIn = new QToolButton(m_zoomWidget);
     m_zoomIn->setIcon(KIcon("zoom-in"));
 
     m_zoomIn = new QToolButton(m_zoomWidget);
     m_zoomIn->setIcon(KIcon("zoom-in"));


@@ -243,7 +243,7 @@ void DolphinStatusBar::setZoomLevel(int zoomLevel)
     m_zoomOut->setEnabled(zoomLevel > m_zoomSlider->minimum());
     m_zoomIn->setEnabled(zoomLevel < m_zoomSlider->maximum());
     m_view->setZoomLevel(zoomLevel);
     m_zoomOut->setEnabled(zoomLevel > m_zoomSlider->minimum());
     m_zoomIn->setEnabled(zoomLevel < m_zoomSlider->maximum());
     m_view->setZoomLevel(zoomLevel);

-    updateZoomSliderToolTip();
+    updateZoomSliderToolTip(zoomLevel);

 }
 
 void DolphinStatusBar::assureVisibleText()
 }
 
 void DolphinStatusBar::assureVisibleText()


@@ -281,6 +281,8 @@ void DolphinStatusBar::zoomIn()
 
 void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
 {
 
 void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
 {

+    updateZoomSliderToolTip(zoomLevel);
+

     QPoint global = m_zoomSlider->rect().topLeft();
     global.ry() += m_zoomSlider->height() / 2;
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global));
     QPoint global = m_zoomSlider->rect().topLeft();
     global.ry() += m_zoomSlider->height() / 2;
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global));


@@ -301,9 +303,9 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
     m_zoomWidget->setVisible(zoomSliderVisible);
 }
 
     m_zoomWidget->setVisible(zoomSliderVisible);
 }
 

-void DolphinStatusBar::updateZoomSliderToolTip()
+void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)

 {
 {

-    const int size = ZoomLevelInfo::iconSizeForZoomLevel(m_view->zoomLevel());
+    const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);

     m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
 }
 
     m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
 }
 

diff --git a/src/dolphinstatusbar.h b/src/dolphinstatusbar.h
index c6a2e8c4380145c0f696e21f02d41071ee934fe6..e28c1c4f46121900c2df61fddd84f42bd03a8b52 100644 (file)
--- a/src/dolphinstatusbar.h
+++ b/src/dolphinstatusbar.h
@@ -165,7 +165,7 @@ private:
      * Updates the text of the zoom slider tooltip to show
      * the currently used size.
      */
      * Updates the text of the zoom slider tooltip to show
      * the currently used size.
      */

-    void updateZoomSliderToolTip();
+    void updateZoomSliderToolTip(int zoomLevel);

 
 private:
     DolphinView* m_view;
 
 private:
     DolphinView* m_view;