Changeset 846 for trunk/src/gui/widgets/qmenubar.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qmenubar.cpp (modified) (10 diffs)

trunk/src/gui/widgets/qmenubar.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -103 +103 @@
     QStyleOptionToolButton opt;
     initStyleOption(&opt);
-    // We do not need to draw both extention arrows
+    // We do not need to draw both extension arrows
     opt.features &= ~QStyleOptionToolButton::HasMenu;
     p.drawComplexControl(QStyle::CC_ToolButton, opt);
@@ -269 +269 @@
 QRect QMenuBarPrivate::actionRect(QAction *act) const
 {
-    Q_Q(const QMenuBar);
     const int index = actions.indexOf(act);
-    if (index == -1)
-        return QRect();
 
     //makes sure the geometries are up-to-date
     const_cast<QMenuBarPrivate*>(this)->updateGeometries();
 
-    if (index >= actionRects.count())
+    if (index < 0 || index >= actionRects.count())
         return QRect(); // that can happen in case of native menubar
 
-    QRect ret = actionRects.at(index);
-    return QStyle::visualRect(q->layoutDirection(), q->rect(), ret);
+    return actionRects.at(index);
 }
 
@@ -506 +502 @@
         //keep moving along..
         x += rect.width() + itemSpacing;
+
+        //make sure we follow the layout direction
+        rect = QStyle::visualRect(q->layoutDirection(), q->rect(), rect);
     }
 }
@@ -770 +769 @@
     const int end =  increment == -1 ? 0 : actions.count() - 1;
 
-    for (int i = start; start != end;) {
+    for (int i = start; i != end;) {
         i += increment;
         QAction *current = actions.at(i);
@@ -1630 +1629 @@
 
 /*!
-  \internal
-
-  Return the item at \a pt, or 0 if there is no item there or if it is
-  a separator item.
+  Returns the QAction at \a pt. Returns 0 if there is no action at \a pt or if
+the location has a separator.
+
+    \sa addAction(), addSeparator()
 */
 QAction *QMenuBar::actionAt(const QPoint &pt) const
@@ -1642 +1641 @@
 
 /*!
-  \internal
-
-  Returns the geometry of action \a act.
+  Returns the geometry of action \a act as a QRect.
+
+    \sa actionAt()
 */
 QRect QMenuBar::actionGeometry(QAction *act) const
@@ -1838 +1837 @@
 
 /*!
-  \internal
-
-  This sets widget \a w to be shown directly on the left of the first or
-  the right of the last menu item, depending on \a corner.
+    \fn void QMenuBar::setCornerWidget(QWidget *widget, Qt::Corner corner)
+
+    This sets the given \a widget to be shown directly on the left of the first
+    menu item, or on the right of the last menu item, depending on \a corner.
+
+    The menu bar takes ownership of \a widget, reparenting it into the menu bar.
+    However, if the \a corner already contains a widget, this previous widget
+    will no longer be managed and will still be a visible child of the menu bar.
+
+   \note Using a corner other than Qt::TopRightCorner or Qt::TopLeftCorner
+    will result in a warning.
 */
 void QMenuBar::setCornerWidget(QWidget *w, Qt::Corner corner)
@@ -1871 +1877 @@
 
 /*!
-  \internal
-
-  Returns the widget in the left of the first or the right of the last menu
-  item, depending on \a corner.
+    Returns the widget on the left of the first or on the right of the last menu
+    item, depending on \a corner.
+
+   \note Using a corner other than Qt::TopRightCorner or Qt::TopLeftCorner
+    will result in a warning.
 */
 QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
@@ -1933 +1940 @@
         }
         macUpdateMenuBar();
-        updateGeometry();
-        setVisible(false);
-        setVisible(true);
+        updateGeometry();
+        if (!d->nativeMenuBar && parentWidget())
+            setVisible(true);
 #endif
     }