diff options
author | Nikita Krupenko <krnekit@gmail.com> | 2017-03-14 23:07:08 +0200 |
---|---|---|
committer | Nikita Krupenko <krnekit@gmail.com> | 2017-04-11 14:39:16 +0000 |
commit | 34f46588aa89537d2c90865694b30ffcda8c421f (patch) | |
tree | d9b0dbd333fc97f31a9fa6ae0980239697db6d61 /src/gui/kernel | |
parent | b018a5ecef7b12c2d28df950a207ff3c7fc3abed (diff) |
Add button layout for dialogs on Android
It used macOS layout before, but it differs from the actual layout in
Android/Material Design: affirmative actions are on the right side,
dismissive actions are directly to the left of the affirmative actions
and neutral actions are on the left side.
[ChangeLog][Platform-specific Changes][Android] Android dialogs now have
more appropriate button layout, with affirmative actions on the right.
Task-number: QTBUG-58060
Change-Id: I0755f80261410c64cf4f854b7f2a72e2d959db28
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformdialoghelper.cpp | 26 | ||||
-rw-r--r-- | src/gui/kernel/qplatformdialoghelper.h | 5 |
2 files changed, 26 insertions, 5 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 01cf98c7c9..ad134ebe7f 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE */ -static const int buttonRoleLayouts[2][5][14] = +static const int buttonRoleLayouts[2][6][14] = { // Qt::Horizontal { @@ -92,7 +92,15 @@ static const int buttonRoleLayouts[2][5][14] = // MacModelessLayout { QPlatformDialogHelper::ResetRole, QPlatformDialogHelper::ApplyRole, QPlatformDialogHelper::ActionRole, QPlatformDialogHelper::Stretch, QPlatformDialogHelper::HelpRole, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, - QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL } + QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL }, + + // AndroidLayout (neutral, stretch, dismissive, affirmative) + // https://material.io/guidelines/components/dialogs.html#dialogs-specs + { QPlatformDialogHelper::HelpRole, QPlatformDialogHelper::ResetRole, QPlatformDialogHelper::ApplyRole, QPlatformDialogHelper::ActionRole, + QPlatformDialogHelper::Stretch, QPlatformDialogHelper::RejectRole | QPlatformDialogHelper::Reverse, + QPlatformDialogHelper::NoRole | QPlatformDialogHelper::Reverse, QPlatformDialogHelper::DestructiveRole | QPlatformDialogHelper::Reverse, + QPlatformDialogHelper::AlternateRole | QPlatformDialogHelper::Reverse, QPlatformDialogHelper::AcceptRole | QPlatformDialogHelper::Reverse, + QPlatformDialogHelper::YesRole | QPlatformDialogHelper::Reverse, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL } }, // Qt::Vertical @@ -120,10 +128,20 @@ static const int buttonRoleLayouts[2][5][14] = // MacModelessLayout { QPlatformDialogHelper::ActionRole, QPlatformDialogHelper::ApplyRole, QPlatformDialogHelper::ResetRole, QPlatformDialogHelper::Stretch, QPlatformDialogHelper::HelpRole, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, - QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL } + QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL }, + + // AndroidLayout + // (affirmative + // dismissive + // neutral) + // https://material.io/guidelines/components/dialogs.html#dialogs-specs + { QPlatformDialogHelper::YesRole, QPlatformDialogHelper::AcceptRole, QPlatformDialogHelper::AlternateRole, QPlatformDialogHelper::DestructiveRole, + QPlatformDialogHelper::NoRole, QPlatformDialogHelper::RejectRole, QPlatformDialogHelper::Stretch, QPlatformDialogHelper::ActionRole, QPlatformDialogHelper::ApplyRole, + QPlatformDialogHelper::ResetRole, QPlatformDialogHelper::HelpRole, QPlatformDialogHelper::EOL, QPlatformDialogHelper::EOL } } }; + QPlatformDialogHelper::QPlatformDialogHelper() { qRegisterMetaType<StandardButton>(); @@ -917,6 +935,8 @@ const int *QPlatformDialogHelper::buttonLayout(Qt::Orientation orientation, Butt policy = MacLayout; #elif defined (Q_OS_LINUX) || defined (Q_OS_UNIX) policy = KdeLayout; +#elif defined (Q_OS_ANDROID) + policy = AndroidLayout; #else policy = WinLayout; #endif diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h index ed88c19c84..f58dcf17f0 100644 --- a/src/gui/kernel/qplatformdialoghelper.h +++ b/src/gui/kernel/qplatformdialoghelper.h @@ -141,13 +141,14 @@ public: Q_ENUM(ButtonRole) enum ButtonLayout { - // keep this in sync with QDialogButtonBox::ButtonLayout and QMessageBox::ButtonLayout + // keep this in sync with QDialogButtonBox::ButtonLayout UnknownLayout = -1, WinLayout, MacLayout, KdeLayout, GnomeLayout, - MacModelessLayout + MacModelessLayout, + AndroidLayout }; QPlatformDialogHelper(); |