Changeset 561 for trunk/src/gui/widgets/qsplitter.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/qsplitter.cpp (modified) (11 diffs)

trunk/src/gui/widgets/qsplitter.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -120 +120 @@
     Q_D(QSplitterHandle);
     d->s = parent;
-    d->hover = false;
     setOrientation(orientation);
 }
@@ -270 +269 @@
 {
     Q_D(QSplitterHandle);
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == Qt::LeftButton) {
         d->mouseOffset = d->pick(e->pos());
+        d->pressed = true;
+        update();
+    }
 }
 
@@ -285 +287 @@
         d->s->setRubberBand(-1);
         moveSplitter(pos);
+    }
+    if (e->button() == Qt::LeftButton) {
+        d->pressed = false;
+        update();
     }
 }
@@ -304 +310 @@
     if (d->hover)
         opt.state |= QStyle::State_MouseOver;
+    if (d->pressed)
+        opt.state |= QStyle::State_Sunken;
     if (isEnabled())
         opt.state |= QStyle::State_Enabled;
@@ -353 +361 @@
     */
     bool first = true;
+    bool allInvisible = n != 0;
     for (int i = 0; i < n ; ++i) {
         QSplitterLayoutStruct *s = list.at(i);
-        s->handle->setHidden(first || s->widget->isHidden());
-        if (!s->widget->isHidden())
+        bool widgetHidden = s->widget->isHidden();
+        if (allInvisible && !widgetHidden && !s->collapsed)
+            allInvisible = false;
+        s->handle->setHidden(first || widgetHidden);
+        if (!widgetHidden)
             first = false;
     }
+
+    if (allInvisible)
+        for (int i = 0; i < n ; ++i) {
+            QSplitterLayoutStruct *s = list.at(i);
+            if (!s->widget->isHidden()) {
+                s->collapsed = false;
+                break;
+            }
+        }
 
     int fi = 2 * q->frameWidth();
@@ -390 +411 @@
 
     if (empty) {
-        if (qobject_cast<QSplitter *>(q->parentWidget())) {
+        if (qobject_cast<QSplitter *>(parent)) {
             // nested splitters; be nice
             maxl = maxt = 0;
@@ -924 +945 @@
 
     \ingroup organizers
-    \mainclass
+
 
     A splitter lets the user control the size of child widgets by dragging the
@@ -1518 +1539 @@
 /*!
     \fn int QSplitter::margin() const
-    Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
 
     Use QWidget::getContentsMargins() instead.