diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/plugins/platforms/windows/qwindowstheme.cpp | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/plugins/platforms/windows/qwindowstheme.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowstheme.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index a59b74cef3..5350b3ca3f 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -52,6 +52,7 @@ #include <QtCore/QSysInfo> #include <QtGui/QPalette> #include <QtGui/QGuiApplication> +#include <QtGui/QWindowSystemInterface> QT_BEGIN_NAMESPACE @@ -220,11 +221,12 @@ static inline QStringList styleNames() QVariant QWindowsTheme::themeHint(ThemeHint hint) const { switch (hint) { - case SystemIconThemeName: - break; + case UseFullScreenForPopupMenu: + return QVariant(true); + case DialogButtonBoxLayout: + return QVariant(int(0)); // QDialogButtonBox::WinLayout case IconThemeSearchPaths: return QVariant(iconThemeSearchPaths()); - break; case StyleNames: return QVariant(styleNames()); case TextCursorWidth: @@ -233,8 +235,12 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const return QVariant(booleanSystemParametersInfo(SPI_GETDROPSHADOW, false)); case MaximumScrollBarDragDistance: return QVariant(qRound(qreal(QWindowsContext::instance()->defaultDPI()) * 1.375)); + case KeyboardScheme: + return QVariant(int(WindowsKeyboardScheme)); + default: + break; } - return QVariant(); + return QPlatformTheme::themeHint(hint); } void QWindowsTheme::refresh() @@ -260,10 +266,10 @@ QPlatformDialogHelper *QWindowsTheme::createPlatformDialogHelper(DialogType type return QWindowsDialogs::createHelper(type); } -void QWindowsTheme::windowsThemeChanged(QWindow * /* window */) +void QWindowsTheme::windowsThemeChanged(QWindow * window) { refresh(); - // QWindowSystemInterface::handleThemeChange(window); + QWindowSystemInterface::handleThemeChange(window); } QT_END_NAMESPACE |