summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-04-08 12:50:34 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-04-16 08:12:54 (GMT)
commit063a1b16582a03dee72f889cc126745eaca66464 (patch)
tree3ac6642c40c4a7f45a4ec8b53f74f504934980ca /src
parente37684d2899b8f2cbc14fa0ab19ab12ed23d495a (diff)
downloadQt-063a1b16582a03dee72f889cc126745eaca66464.zip
Qt-063a1b16582a03dee72f889cc126745eaca66464.tar.gz
Qt-063a1b16582a03dee72f889cc126745eaca66464.tar.bz2
Fixed titlebar on X11 for fixed size windows with Qt::CustomizeWindowHint
Task-number: 250326 Reviewed-by: Brad
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwidget_x11.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index ea8af93..76734d4 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -1750,8 +1750,8 @@ void QWidgetPrivate::show_sys()
mwmhints.functions &= ~MWM_FUNC_RESIZE;
}
- mwmhints.flags |= MWM_HINTS_DECORATIONS;
if (mwmhints.decorations == MWM_DECOR_ALL) {
+ mwmhints.flags |= MWM_HINTS_DECORATIONS;
mwmhints.decorations = (MWM_DECOR_BORDER
| MWM_DECOR_TITLE
| MWM_DECOR_MENU);
@@ -1760,10 +1760,12 @@ void QWidgetPrivate::show_sys()
}
if (q->windowFlags() & Qt::WindowMinimizeButtonHint) {
+ mwmhints.flags |= MWM_HINTS_DECORATIONS;
mwmhints.decorations |= MWM_DECOR_MINIMIZE;
mwmhints.functions |= MWM_FUNC_MINIMIZE;
}
if (q->windowFlags() & Qt::WindowMaximizeButtonHint) {
+ mwmhints.flags |= MWM_HINTS_DECORATIONS;
mwmhints.decorations |= MWM_DECOR_MAXIMIZE;
mwmhints.functions |= MWM_FUNC_MAXIMIZE;
}