tools/designer/src/lib/shared/qdesigner_menu.cpp
changeset 33 3e2da88830cd
parent 18 2f34d5167611
--- a/tools/designer/src/lib/shared/qdesigner_menu.cpp	Tue Jul 06 15:10:48 2010 +0300
+++ b/tools/designer/src/lib/shared/qdesigner_menu.cpp	Wed Aug 18 10:37:55 2010 +0300
@@ -77,6 +77,7 @@
 static inline void extendClickableArea(QRect *subMenuRect, Qt::LayoutDirection dir)
 {
     switch (dir) {
+    case Qt::LayoutDirectionAuto: // Should never happen
     case Qt::LeftToRight:
         subMenuRect->setLeft(subMenuRect->left() - 20);
         break;
@@ -931,8 +932,8 @@
 
     if (ctrl)
         (void) swap(m_currentIndex, m_currentIndex - 1);
-
-    m_currentIndex = qMax(0, --m_currentIndex);
+    --m_currentIndex;
+    m_currentIndex = qMax(0, m_currentIndex);
     // Always re-select, swapping destroys order
     update();
     selectCurrentAction();
@@ -947,7 +948,8 @@
     if (ctrl)
         (void) swap(m_currentIndex + 1, m_currentIndex);
 
-    m_currentIndex = qMin(actions().count() - 1, ++m_currentIndex);
+    ++m_currentIndex;
+    m_currentIndex = qMin(actions().count() - 1, m_currentIndex);
     update();
     if (!ctrl)
         selectCurrentAction();