summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Slobodin <vitaliy.slobodin@gmail.com>2017-01-07 17:09:42 +0300
committerVitaliy Slobodin <vitaliy.slobodin@gmail.com>2017-01-12 22:19:59 +0000
commitfce06b359971d798474892fad2d56092f27b0f6b (patch)
treeab171c9a48166d776724f1c75eb7cd19408ea0b7
parenta0c60c53c0fe1b1f6b5ab52944e031a3684e3de1 (diff)
Fix misplaced checkboxes on macOS
Checkboxes without State_Active flag are missplaced on macOS. Set this flag by default to paint checkboxes in correct positions. Task-number: QTBUG-42948 Task-number: QTBUG-43070 Change-Id: Ie86f3dec156e31c90e454d8f1b41e4d4ec68c8b0 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r--Source/WebCore/platform/qt/RenderThemeQStyle.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
index 9f3d50a2d..59e74c282 100644
--- a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
@@ -591,6 +591,11 @@ ControlPart RenderThemeQStyle::initializeCommonQStyleOptions(QStyleFacadeOption
option.state &= ~(QStyleFacade::State_HasFocus | QStyleFacade::State_MouseOver);
option.state |= QStyleFacade::State_Enabled;
+#ifdef Q_OS_DARWIN
+ // to render controls in correct positions we also should set the State_Active flag
+ option.state |= QStyleFacade::State_Active;
+#endif
+
if (isReadOnlyControl(o))
// Readonly is supported on textfields.
option.state |= QStyleFacade::State_ReadOnly;