diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-04-29 08:01:24 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-05-06 09:24:30 (GMT) |
| commit | 384869482e2481685dd409208f583a1acc77bcc8 (patch) | |
| tree | 883df0c7ace771cbd7f5837f2a745ad07b6d7250 /src/gui/kernel/qwidget_p.h | |
| parent | bd29efb125142c936a57a9e6ad35c3f9f76b8e17 (diff) | |
| download | Qt-384869482e2481685dd409208f583a1acc77bcc8.zip Qt-384869482e2481685dd409208f583a1acc77bcc8.tar.gz Qt-384869482e2481685dd409208f583a1acc77bcc8.tar.bz2 | |
Mac OS X QWidget::setMinimumSize locks.
There was code for updating the size constrains inside
setConstraints_sys. This is now added. Factored out the code that
does this into a function, and since we never applied size constraines
on a window upon creation, I also added an extra call from that
code part
Task-number: 219695
Reviewed-by: Trenton Schulz
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index db78682..2461820 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -257,7 +257,8 @@ public: void macUpdateIsOpaque(); void setEnabled_helper_sys(bool enable); bool isRealWindow() const; - void applyMaxAndMinSizeConstraints(int &w, int &h); + void adjustWithinMaxAndMinSize(int &w, int &h); + void applyMaxAndMinSizeOnWindow(); #endif void raise_sys(); |