diff options
author | Nikita Krupenko <krnekit@gmail.com> | 2017-03-09 20:01:27 +0200 |
---|---|---|
committer | Nikita Krupenko <krnekit@gmail.com> | 2017-03-10 18:09:25 +0000 |
commit | eba62334a9b646f61e73b5b734ec5971e56d672a (patch) | |
tree | cf2b6f8db6e3c27f62bc32d7fd61f0c901815c5b /src/quicktemplates2/qquickdialogbuttonbox.cpp | |
parent | e91c9feab8a0cf4cff71cc68ab0f001b1531504f (diff) |
Material: use proper layout of the buttons in the DialogButtonBox
Instead of using system button layout, use layout from macOS, which
better fits the Material Design guidelines and also used in the Android
QPA plugin.
Task-number: QTBUG-58060
Change-Id: I06381219b5f1ad0a32742487fd314a8017d82dfc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialogbuttonbox.cpp')
-rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 40b1e2c7..b85e85c8 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -258,7 +258,12 @@ void QQuickDialogButtonBoxPrivate::updateLayout() return firstRole != QPlatformDialogHelper::InvalidRole; } - const int *m_layout = QPlatformDialogHelper::buttonLayout(); + static const int *themeButtonLayout() + { + const int hint = QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogButtonBoxLayout).toInt(); + return QPlatformDialogHelper::buttonLayout(Qt::Horizontal, static_cast<QPlatformDialogHelper::ButtonLayout>(hint)); + } + const int *m_layout = themeButtonLayout(); }; std::sort(buttons.begin(), buttons.end(), ButtonLayout()); |