┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/dolphinstatusbar.cpp
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2009-01-05 18:41:06 +0000
committerPeter Penz <[email protected]>2009-01-05 18:41:06 +0000
commitc11baf1ad542260a067cd42643bef8939bed5d05 (patch)
tree36f6f676940546ec9b1b79fff0b2d0c3ba5932d1 /src/dolphinstatusbar.cpp
parentb2db9bd9eddcfaa01cdc2239bb73fa7f74767d56 (diff)
fixed issue that the zoom slider tooltip showed the previous size when changing the slider with the mouse
svn path=/trunk/KDE/kdebase/apps/; revision=906188
Diffstat (limited to 'src/dolphinstatusbar.cpp')
-rw-r--r--src/dolphinstatusbar.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 9d25eb103..caa784049 100644
--- 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());
- updateZoomSliderToolTip();
+ updateZoomSliderToolTip(view->zoomLevel());
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);
- updateZoomSliderToolTip();
+ updateZoomSliderToolTip(zoomLevel);
}
void DolphinStatusBar::assureVisibleText()
@@ -281,6 +281,8 @@ void DolphinStatusBar::zoomIn()
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));
@@ -301,9 +303,9 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
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));
}