Changeset 865 for trunk/src/gui

Timestamp:

May 16, 2011, 4:09:34 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qpixmap_s60.cpp (modified) (2 diffs)
• src/gui/kernel/qapplication_s60.cpp (modified) (1 diff)
• src/gui/kernel/qwidget_s60.cpp (modified) (1 diff)
• src/gui/styles/qs60style.cpp (modified) (1 diff)

trunk/src/gui/image/qpixmap_s60.cpp

@@ -600 +600 @@
 }
 
+Q_GUI_EXPORT int qt_defaultDpiX();
+Q_GUI_EXPORT int qt_defaultDpiY();
+
 int QS60PixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
 {
@@ -610 +613 @@
     case QPaintDevice::PdmHeight:
         return cfbsBitmap->SizeInPixels().iHeight;
-    case QPaintDevice::PdmWidthMM: {
-        TInt twips = cfbsBitmap->SizeInTwips().iWidth;
-        return (int)(twips * (25.4/KTwipsPerInch));
-    }
-    case QPaintDevice::PdmHeightMM: {
-        TInt twips = cfbsBitmap->SizeInTwips().iHeight;
-        return (int)(twips * (25.4/KTwipsPerInch));
-    }
+    case QPaintDevice::PdmWidthMM:
+        return qRound(cfbsBitmap->SizeInPixels().iWidth * 25.4 / qt_defaultDpiX());
+    case QPaintDevice::PdmHeightMM:
+        return qRound(cfbsBitmap->SizeInPixels().iHeight * 25.4 / qt_defaultDpiY());
     case QPaintDevice::PdmNumColors:
         return TDisplayModeUtils::NumDisplayModeColors(cfbsBitmap->DisplayMode());
     case QPaintDevice::PdmDpiX:
-    case QPaintDevice::PdmPhysicalDpiX: {
-        TReal inches = cfbsBitmap->SizeInTwips().iWidth / (TReal)KTwipsPerInch;
-        TInt pixels = cfbsBitmap->SizeInPixels().iWidth;
-        return pixels / inches;
-    }
+    case QPaintDevice::PdmPhysicalDpiX:
+        return qt_defaultDpiX();
     case QPaintDevice::PdmDpiY:
-    case QPaintDevice::PdmPhysicalDpiY: {
-        TReal inches = cfbsBitmap->SizeInTwips().iHeight / (TReal)KTwipsPerInch;
-        TInt pixels = cfbsBitmap->SizeInPixels().iHeight;
-        return pixels / inches;
-    }
+    case QPaintDevice::PdmPhysicalDpiY:
+        return qt_defaultDpiY();
     case QPaintDevice::PdmDepth:
         return TDisplayModeUtils::NumDisplayModeBitsPerPixel(cfbsBitmap->DisplayMode());

trunk/src/gui/kernel/qapplication_s60.cpp

@@ -1244 +1244 @@
         qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
 #ifdef Q_WS_S60
-        // If widget is fullscreen/minimized, hide status pane and button container otherwise show them.
-        QWidget *const window = qwidget->window();
-        if (!window->parentWidget()) { // Only top level native windows have control over cba/status pane
-            const bool decorationsVisible = !(window->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
-            const bool statusPaneVisibility = decorationsVisible;
-            const bool isFullscreen = window->windowState() & Qt::WindowFullScreen;
-            const bool cbaVisibilityHint = window->windowFlags() & Qt::WindowSoftkeysVisibleHint;
-            const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaVisibilityHint));
-            S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
+        if (qwidget->isWindow()) {
+            QWidget *const window = qwidget->window();
+            QWidget *parentWindow = window->parentWidget();
+            if (parentWindow) {
+                while (parentWindow->parentWidget())
+                    parentWindow = parentWindow->parentWidget();
+            } else {
+                parentWindow = window;
+            }
+
+            const bool parentDecorationsVisible = !(parentWindow->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
+            const bool parentIsFullscreen = parentWindow->windowState() & Qt::WindowFullScreen;
+            const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
+            bool buttonGroupVisibility = (parentDecorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
+
+            // For non-toplevel normal and maximized windows, show cba if window has softkey
+            // actions even if topmost parent is not showing cba. Do the same for fullscreen
+            // windows that request it.
+            if (!buttonGroupVisibility
+                && window->parentWidget()
+                && !(window->windowState() & Qt::WindowMinimized)
+                && ((window->windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(window->windowState() & Qt::WindowFullScreen))) {
+                for (int i = 0; i < window->actions().size(); ++i) {
+                    if (window->actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
+                        buttonGroupVisibility = true;
+                        break;
+                    }
+                }
+            }
+            S60->setStatusPaneAndButtonGroupVisibility(parentDecorationsVisible, buttonGroupVisibility);
         }
 #endif

trunk/src/gui/kernel/qwidget_s60.cpp

@@ -1185 +1185 @@
 
 #ifdef Q_WS_S60
-        bool decorationsVisible(false);
-        if (!parentWidget()) { // Only top level native windows have control over cba/status pane
-            // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
-            // The window decoration visibility has to be changed before doing actual window state
-            // change since in that order the availableGeometry will return directly the right size and
-            // we will avoid unnecessary redraws
-            decorationsVisible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
-            const bool statusPaneVisibility = decorationsVisible;
-            const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaRequested));
-            S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
-        }
+        // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
+        // The window decoration visibility has to be changed before doing actual window state
+        // change since in that order the availableGeometry will return directly the right size and
+        // we will avoid unnecessary redraws
+        Qt::WindowStates comparisonState = newstate;
+        QWidget *parentWindow = parentWidget();
+        if (parentWindow) {
+            while (parentWindow->parentWidget())
+                parentWindow = parentWindow->parentWidget();
+            comparisonState = parentWindow->windowState();
+        } else {
+            parentWindow = this;
+        }
+
+        const bool decorationsVisible = !(comparisonState & (Qt::WindowFullScreen | Qt::WindowMinimized));
+        const bool parentIsFullscreen = comparisonState & Qt::WindowFullScreen;
+        const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
+        bool buttonGroupVisibility = (decorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
+
+        // For non-toplevel normal and maximized windows, show cba if window has softkey
+        // actions even if topmost parent is not showing cba. Do the same for fullscreen
+        // windows that request it.
+        if (!buttonGroupVisibility
+            && parentWidget()
+            && !(newstate & Qt::WindowMinimized)
+            && ((windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(newstate & Qt::WindowFullScreen))) {
+            for (int i = 0; i < actions().size(); ++i) {
+                if (actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
+                    buttonGroupVisibility = true;
+                    break;
+                }
+            }
+        }
+        S60->setStatusPaneAndButtonGroupVisibility(decorationsVisible, buttonGroupVisibility);
+
 #endif // Q_WS_S60
 

trunk/src/gui/styles/qs60style.cpp

@@ -2644 +2644 @@
             //native items have small empty areas at the beginning and end of menu item
             sz.setWidth(sz.width() + 2 * pixelMetric(PM_MenuHMargin) + 2 * QS60StylePrivate::pixelMetric(PM_FrameCornerWidth));
-            if (QS60StylePrivate::isTouchSupported())
+            if (QS60StylePrivate::isTouchSupported()) {
                 //Make itemview easier to use in touch devices
+                sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin));
                 //QCommonStyle does not adjust height with horizontal margin, it only adjusts width
-                sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin) - 8); //QCommonstyle adds 8 to height that this style handles through PM values
+                if (ct == CT_MenuItem)
+                    sz.setHeight(sz.height() - 8); //QCommonstyle adds 8 to height that this style handles through PM values
+            }
             break;
 #ifndef QT_NO_COMBOBOX