diff options
author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2012-07-06 16:26:52 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-18 17:39:50 +0200 |
commit | b1893f7c49707ac386a003e3e974f0c04a1d29ff (patch) | |
tree | 4df4aaf749f16751bb15e8bfbf0793eba77c807f /examples/widgets/widgets | |
parent | d92fd4ca54ae71e9c0190d15df9c131435a4be68 (diff) |
Introducing NoDropShadowWindowHint window flag
Added suppport on QCocoaWindow.
Also we deprecate WA_MacNoShadow since it isn't used anywhere, and updated
the 'windowflags' example app.
Change-Id: Id0b453ba15a23b768b0615838597bca139f507ad
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'examples/widgets/widgets')
3 files changed, 10 insertions, 3 deletions
diff --git a/examples/widgets/widgets/windowflags/controllerwindow.cpp b/examples/widgets/widgets/windowflags/controllerwindow.cpp index 15d5bcf23b..95236ec32a 100644 --- a/examples/widgets/widgets/windowflags/controllerwindow.cpp +++ b/examples/widgets/widgets/windowflags/controllerwindow.cpp @@ -99,6 +99,8 @@ void ControllerWindow::updatePreview() flags |= Qt::X11BypassWindowManagerHint; if (framelessWindowCheckBox->isChecked()) flags |= Qt::FramelessWindowHint; + if (windowNoShadowCheckBox->isChecked()) + flags |= Qt::NoDropShadowWindowHint; if (windowTitleCheckBox->isChecked()) flags |= Qt::WindowTitleHint; if (windowSystemMenuCheckBox->isChecked()) @@ -171,6 +173,7 @@ void ControllerWindow::createHintsGroupBox() x11BypassWindowManagerCheckBox = createCheckBox(tr("X11 bypass window manager")); framelessWindowCheckBox = createCheckBox(tr("Frameless window")); + windowNoShadowCheckBox = createCheckBox(tr("No drop shadow")); windowTitleCheckBox = createCheckBox(tr("Window title")); windowSystemMenuCheckBox = createCheckBox(tr("Window system menu")); windowMinimizeButtonCheckBox = createCheckBox(tr("Window minimize button")); @@ -187,8 +190,9 @@ void ControllerWindow::createHintsGroupBox() layout->addWidget(msWindowsFixedSizeDialogCheckBox, 0, 0); layout->addWidget(x11BypassWindowManagerCheckBox, 1, 0); layout->addWidget(framelessWindowCheckBox, 2, 0); - layout->addWidget(windowTitleCheckBox, 3, 0); - layout->addWidget(windowSystemMenuCheckBox, 4, 0); + layout->addWidget(windowNoShadowCheckBox, 3, 0); + layout->addWidget(windowTitleCheckBox, 4, 0); + layout->addWidget(windowSystemMenuCheckBox, 5, 0); layout->addWidget(windowMinimizeButtonCheckBox, 0, 1); layout->addWidget(windowMaximizeButtonCheckBox, 1, 1); layout->addWidget(windowCloseButtonCheckBox, 2, 1); @@ -196,7 +200,7 @@ void ControllerWindow::createHintsGroupBox() layout->addWidget(windowShadeButtonCheckBox, 4, 1); layout->addWidget(windowStaysOnTopCheckBox, 5, 1); layout->addWidget(windowStaysOnBottomCheckBox, 6, 1); - layout->addWidget(customizeWindowHintCheckBox, 5, 0); + layout->addWidget(customizeWindowHintCheckBox, 6, 0); hintsGroupBox->setLayout(layout); } //! [6] diff --git a/examples/widgets/widgets/windowflags/controllerwindow.h b/examples/widgets/widgets/windowflags/controllerwindow.h index 7479fe8bee..5be73b788e 100644 --- a/examples/widgets/widgets/windowflags/controllerwindow.h +++ b/examples/widgets/widgets/windowflags/controllerwindow.h @@ -88,6 +88,7 @@ private: QCheckBox *msWindowsFixedSizeDialogCheckBox; QCheckBox *x11BypassWindowManagerCheckBox; QCheckBox *framelessWindowCheckBox; + QCheckBox *windowNoShadowCheckBox; QCheckBox *windowTitleCheckBox; QCheckBox *windowSystemMenuCheckBox; QCheckBox *windowMinimizeButtonCheckBox; diff --git a/examples/widgets/widgets/windowflags/previewwindow.cpp b/examples/widgets/widgets/windowflags/previewwindow.cpp index f8c297a41e..65ff83d44b 100644 --- a/examples/widgets/widgets/windowflags/previewwindow.cpp +++ b/examples/widgets/widgets/windowflags/previewwindow.cpp @@ -94,6 +94,8 @@ void PreviewWindow::setWindowFlags(Qt::WindowFlags flags) text += "\n| Qt::X11BypassWindowManagerHint"; if (flags & Qt::FramelessWindowHint) text += "\n| Qt::FramelessWindowHint"; + if (flags & Qt::NoDropShadowWindowHint) + text += "\n| Qt::NoDropShadowWindowHint"; if (flags & Qt::WindowTitleHint) text += "\n| Qt::WindowTitleHint"; if (flags & Qt::WindowSystemMenuHint) |