diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/fortuneclient/client.cpp | 2 | ||||
-rw-r--r-- | examples/network/fortuneserver/server.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/dialogs/standarddialogs/dialog.cpp | 16 | ||||
-rw-r--r-- | examples/widgets/dialogs/standarddialogs/main.cpp | 12 |
4 files changed, 23 insertions, 9 deletions
diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp index b4c3d9328d..42fed30445 100644 --- a/examples/network/fortuneclient/client.cpp +++ b/examples/network/fortuneclient/client.cpp @@ -117,7 +117,7 @@ Client::Client(QWidget *parent) //! [4] QGridLayout *mainLayout = Q_NULLPTR; - if (QGuiApplication::styleHints()->showIsFullScreen()) { + if (QGuiApplication::styleHints()->showIsFullScreen() || QGuiApplication::styleHints()->showIsMaximized()) { QVBoxLayout *outerVerticalLayout = new QVBoxLayout(this); outerVerticalLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); QHBoxLayout *outerHorizontalLayout = new QHBoxLayout; diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index 28f0230894..089f594cab 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -100,7 +100,7 @@ Server::Server(QWidget *parent) buttonLayout->addStretch(1); QVBoxLayout *mainLayout = Q_NULLPTR; - if (QGuiApplication::styleHints()->showIsFullScreen()) { + if (QGuiApplication::styleHints()->showIsFullScreen() || QGuiApplication::styleHints()->showIsMaximized()) { QVBoxLayout *outerVerticalLayout = new QVBoxLayout(this); outerVerticalLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); QHBoxLayout *outerHorizontalLayout = new QHBoxLayout; diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index b4232c36f6..b28cf0f934 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -98,9 +98,19 @@ int DialogOptionsWidget::value() const Dialog::Dialog(QWidget *parent) : QWidget(parent) { - QVBoxLayout *mainLayout = new QVBoxLayout(this); + QVBoxLayout *verticalLayout; + if (QGuiApplication::styleHints()->showIsFullScreen() || QGuiApplication::styleHints()->showIsMaximized()) { + QHBoxLayout *horizontalLayout = new QHBoxLayout(this); + QGroupBox *groupBox = new QGroupBox(QGuiApplication::applicationDisplayName(), this); + horizontalLayout->addWidget(groupBox); + horizontalLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Ignored)); + verticalLayout = new QVBoxLayout(groupBox); + } else { + verticalLayout = new QVBoxLayout(this); + } + QToolBox *toolbox = new QToolBox; - mainLayout->addWidget(toolbox); + verticalLayout->addWidget(toolbox); errorMessageDialog = new QErrorMessage(this); @@ -291,7 +301,7 @@ Dialog::Dialog(QWidget *parent) layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 5, 0); toolbox->addItem(page, tr("Message Boxes")); - setWindowTitle(tr("Standard Dialogs")); + setWindowTitle(QGuiApplication::applicationDisplayName()); } void Dialog::setInteger() diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp index a13e37905c..8a8ee2ac0b 100644 --- a/examples/widgets/dialogs/standarddialogs/main.cpp +++ b/examples/widgets/dialogs/standarddialogs/main.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #include <QApplication> +#include <QStyleHints> #include <QDesktopWidget> #include <QTranslator> #include <QLocale> @@ -49,6 +50,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); + QGuiApplication::setApplicationDisplayName(Dialog::tr("Standard Dialogs")); #ifndef QT_NO_TRANSLATION QString translatorFileName = QLatin1String("qt_"); @@ -59,10 +61,12 @@ int main(int argc, char *argv[]) #endif Dialog dialog; - const QRect availableGeometry = QApplication::desktop()->availableGeometry(&dialog); - dialog.resize(availableGeometry.width() / 3, availableGeometry.height() * 2 / 3); - dialog.move((availableGeometry.width() - dialog.width()) / 2, - (availableGeometry.height() - dialog.height()) / 2); + if (!QGuiApplication::styleHints()->showIsFullScreen() && !QGuiApplication::styleHints()->showIsMaximized()) { + const QRect availableGeometry = QApplication::desktop()->availableGeometry(&dialog); + dialog.resize(availableGeometry.width() / 3, availableGeometry.height() * 2 / 3); + dialog.move((availableGeometry.width() - dialog.width()) / 2, + (availableGeometry.height() - dialog.height()) / 2); + } dialog.show(); return app.exec(); |