Changeset 561 for trunk/src/gui/widgets/qpushbutton.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qpushbutton.cpp (modified) (11 diffs)

trunk/src/gui/widgets/qpushbutton.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -64 +64 @@
 #endif
 
+
 #include "private/qpushbutton_p.h"
 
@@ -74 +75 @@
 
     \ingroup basicwidgets
-    \mainclass
+
 
     The push button, or command button, is perhaps the most commonly
@@ -388 +389 @@
 {
     Q_D(const QPushButton);
-    if (d->sizeHint.isValid())
+    if (d->sizeHint.isValid())
         return d->sizeHint;
+
     ensurePolished();
 
@@ -528 +530 @@
 
     if (menu && !d->menu) {
-        disconnect(this, SIGNAL(pressed()), this, SLOT(_q_popupPressed()));
-        connect(this, SIGNAL(pressed()), this, SLOT(_q_popupPressed()));
+        connect(this, SIGNAL(pressed()), this, SLOT(_q_popupPressed()), Qt::UniqueConnection);
     }
     if (d->menu)
@@ -576 +577 @@
 
     menu->setNoReplayFor(q);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     bool horizontal = true;
 #if !defined(QT_NO_TOOLBAR)
-    QToolBar *tb = qobject_cast<QToolBar*>(q->parentWidget());
+    QToolBar *tb = qobject_cast<QToolBar*>();
     if (tb && tb->orientation() == Qt::Vertical)
         horizontal = false;
 #endif
+
     QWidgetItem item(q);
     QRect rect = item.geometry();
@@ -591 +613 @@
     int y = globalPos.y();
     if (horizontal) {
-        if (globalPos.y() + rect.height() + menuSize.height() <= qApp->desktop()->height()) {
+        if (globalPos.y() + rect.height() + menuSize.height() <= height()) {
             y += rect.height();
         } else {
@@ -599 +621 @@
             x += rect.width() - menuSize.width();
     } else {
-        if (globalPos.x() + rect.width() + menu->sizeHint().width() <= qApp->desktop()->width())
+        if (globalPos.x() + rect.width() + menu->sizeHint().width() <= width())
             x += rect.width();
         else
             x -= menuSize.width();
     }
-    QPointer<QPushButton> guard(q);
-
-    //Because of a delay in menu effects, we must keep track of the
-    //menu visibility to avoid flicker on button release
-    menuOpen = true;
-    menu->exec(QPoint(x, y));
-    if (guard) {
-        menuOpen = false;
-        // on some platforms (e.g. OS/2) QPushButton::focusOutEvent() may be called
-        // before we return from exec() above (for example, as a result of window
-        // deactivation). It will set down to false but since menuOpen won't be
-        // false yet, the button will be redrawn as sunken still. Simple setDown(false)
-        // won't do anything in this case so we need to call update() instead to make
-        // sure the button is redrawn as unsunken.
-        if (down)
-            q->setDown(false);
-        else
-            q->update();
-    }
-}
+
+    return QPoint(x,y);
+}
+
 #endif // QT_NO_MENU
 
@@ -668 +674 @@
                 d->resetLayoutItemMargins();
                 updateGeometry();
+
+
     }
     return QAbstractButton::event(e);