comparison view/Pane.cpp @ 204:942cfa1df966

* Fix occasional misplacement of zoom wheels
* Disable tearoff in context menu (it always got activated when you just clicked
  and released)

     if (count != 50 && m_hthumb->getDefaultValue() == 0) {
         m_hthumb->setDefaultValue(count - current);
 //        std::cerr << "set default value to " << m_hthumb->getDefaultValue() << std::endl;
     }
 
+    bool haveVThumb = false;
+
     if (layer) {
         int defaultStep = 0;
         int max = layer->getVerticalZoomSteps(defaultStep);
         if (max == 0) {
             m_vthumb->hide();
         } else {
+            haveVThumb = true;
             m_vthumb->show();
             m_vthumb->blockSignals(true);
             m_vthumb->setMinimumValue(0);
             m_vthumb->setMaximumValue(max);
             m_vthumb->setDefaultValue(defaultStep);

         if (!m_headsUpDisplay->isVisible()) {
             m_headsUpDisplay->show();
             connect(m_manager, SIGNAL(zoomLevelChanged()),
                     this, SLOT(zoomLevelChanged()));
         }
-        if (m_vthumb->isVisible()) {
+        if (haveVThumb) {
+            std::cerr << "vthumb is visible, moving to " << height() -86 << std::endl;
+            m_headsUpDisplay->setFixedHeight(m_vthumb->height() + m_hthumb->height());
             m_headsUpDisplay->move(width() - 86, height() - 86);
         } else {
-            m_headsUpDisplay->move(width() - 86, height() - 51);
+            std::cerr << "vthumb is invisible, moving to " << height() -51 << std::endl;
+            m_headsUpDisplay->setFixedHeight(m_hthumb->height());
+            m_headsUpDisplay->move(width() - 86, height() - 16);
         }
     } else {
         m_headsUpDisplay->hide();
         if (m_manager) {
             disconnect(m_manager, SIGNAL(zoomLevelChanged()),