Changeset 186 for trunk/src

Timestamp:

Sep 16, 2009, 11:12:02 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Enabled actual enforcing min/max Qt widget constraints for top-level windows.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (3 diffs)
• qwidget_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -126 +126 @@
     QWidgetData *dataPtr() { return data; }
     QWidgetPrivate *dptr() { return d_func(); }
-//  QRect frameStrut() const { return d_func()->frameStrut(); }
+    QRect frameStrut() const { return d_func()->frameStrut(); }
     bool        pmEvent(QMSG *m, MRESULT *r) { return QWidget::pmEvent(m, r); }
 //  void        markFrameStrutDirty() { data->fstrut_dirty = 1; }
@@ -917 +917 @@
 #endif
 
+        MRESULT rc = (MRESULT) FALSE;
+
         HWND hwndC = WinWindowFromID(hwnd, FID_CLIENT);
         QETWidget *widget = (QETWidget*)QWidget::find(hwndC);
@@ -947 +949 @@
             if (widget->translateConfigEvent(qmsg))
                 return (MRESULT)TRUE;
+            break;
+        }
+
+        case WM_QUERYTRACKINFO: {
+            QWExtra *x = widget->xtra();
+            if (x) {
+                rc = QtOldFrameProc(hwnd, msg, mp1, mp2);
+                PTRACKINFO pti = (PTRACKINFO) mp2;
+                int minw = 0, minh = 0;
+                int maxw = QWIDGETSIZE_MAX, maxh = QWIDGETSIZE_MAX;
+                QRect fs = widget->frameStrut();
+                if (x->minw > 0)
+                    minw = x->minw + fs.left() + fs.right();
+                if (x->minh > 0)
+                    minh = x->minh + fs.top() + fs.bottom();
+                if (x->maxw < QWIDGETSIZE_MAX)
+                    maxw = x->maxw >= x->minw ? x->maxw : x->minw + fs.left() + fs.right();
+                if (x->maxh < QWIDGETSIZE_MAX)
+                    maxh = x->maxh >= x->minh ? x->maxh : x->minh + fs.top() + fs.bottom();
+                // obey system recommended minimum size (to emulate Qt/Win32)
+                pti->ptlMinTrackSize.x = qMax<LONG>(minw, pti->ptlMinTrackSize.x);
+                pti->ptlMinTrackSize.y = qMax<LONG>(minh, pti->ptlMinTrackSize.y);
+                // we assume that PM doesn't restrict the maximum size by default
+                // and use it as an absolute maximum (values above it will cause
+                // PM to disable window sizing and moving for some reason)
+                pti->ptlMaxTrackSize.x = qMin<LONG>(maxw, pti->ptlMaxTrackSize.x);
+                pti->ptlMaxTrackSize.y = qMin<LONG>(maxh, pti->ptlMaxTrackSize.y);
+                return rc;
+            }
             break;
         }

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -2196 +2196 @@
 void QWidgetPrivate::setConstraints_sys()
 {
-    // @todo implement
+    // @todo is there a way to show/hide the Maximize button according to
+    // the shouldShowMaximizeButton() return value?
 }