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

trunk/src/gui/widgets/qtabwidget.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$
 **
@@ -65 +65 @@
     \ingroup organizers
     \ingroup basicwidgets
-    \mainclass
+
 
     A tab widget provides a tab bar (see QTabBar) and a "page area"
@@ -314 +314 @@
         break;
     }
+
     option->tabBarSize = t;
+
+    if (QStyleOptionTabWidgetFrameV2 *tabframe = qstyleoption_cast<QStyleOptionTabWidgetFrameV2*>(option)) {
+        QRect tbRect = tabBar()->geometry();
+        QRect selectedTabRect = tabBar()->tabRect(tabBar()->currentIndex());
+        tabframe->tabBarRect = tbRect;
+        selectedTabRect.moveTopLeft(selectedTabRect.topLeft() + tbRect.topLeft());
+        tabframe->selectedTabRect = selectedTabRect;
+    }
 }
 
@@ -505 +514 @@
 
 /*!
-    Returns true if the the page at position \a index is enabled; otherwise returns false.
+    Returns true if the page at position \a index is enabled; otherwise returns false.
 
     \sa setTabEnabled(), QWidget::isEnabled()
@@ -691 +700 @@
     connect(d->tabs, SIGNAL(currentChanged(int)),
             this, SLOT(_q_showTab(int)));
-    connect(d->tabs, SIGNAL(tabMoved(int, int)),
-            this, SLOT(_q_tabMoved(int, int)));
+    connect(d->tabs, SIGNAL(tabMoved(int,int)),
+            this, SLOT(_q_tabMoved(int,int)));
     if (d->tabs->tabsClosable())
         connect(d->tabs, SIGNAL(tabCloseRequested(int)),
@@ -757 +766 @@
         return; // nothing to do
 
-    QStyleOptionTabWidgetFrame option;
+    QStyleOptionTabWidgetFrameV2 option;
     initStyleOption(&option);
 
@@ -1058 +1067 @@
             }
         }
-        if (!qApp->focusWidget())
+        if (!QApplication::focusWidget())
             d->tabs->setFocus();
     } else {
@@ -1168 +1177 @@
 {
     Q_D(QTabWidget);
-    QStylePainter p(this);
     if (documentMode()) {
+        QStylePainter p(this, tabBar());
         if (QWidget *w = cornerWidget(Qt::TopLeftCorner)) {
             QStyleOptionTabBarBaseV2 opt;
@@ -1186 +1195 @@
         return;
     }
-
-    QStyleOptionTabWidgetFrame opt;
+    QStylePainter p(this);
+
+    QStyleOptionTabWidgetFrameV2 opt;
     initStyleOption(&opt);
     opt.rect = d->panelRect;