summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-05-22 17:09:46 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-05-22 17:18:15 (GMT)
commit263834072595e8de71136886d607f80b5b015572 (patch)
tree6140ce54d57e1b55fbd2af1a84bc1583cce71993
parentd9ab330f613bd2c921ba00ed36b6eea8927aec80 (diff)
downloadQt-263834072595e8de71136886d607f80b5b015572.zip
Qt-263834072595e8de71136886d607f80b5b015572.tar.gz
Qt-263834072595e8de71136886d607f80b5b015572.tar.bz2
Disable the SH_Menu_AllowActiveAndDisabled on plastique style.
This restore the KDE3's behaviour. Do not disable it on Windows as we are aware of customer using the QPlastiqueStyle on Windows that might rely on this (for behaviour consistancy with others Windows applications) Reviewed-by: jbache Task-number: 254210
-rw-r--r--src/gui/styles/qplastiquestyle.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp
index 66464ff..587f2b5 100644
--- a/src/gui/styles/qplastiquestyle.cpp
+++ b/src/gui/styles/qplastiquestyle.cpp
@@ -5460,6 +5460,11 @@ int QPlastiqueStyle::styleHint(StyleHint hint, const QStyleOption *option, const
case SH_Menu_SubMenuPopupDelay:
ret = 96; // from Plastik
break;
+#ifndef Q_OS_WIN
+ case SH_Menu_AllowActiveAndDisabled:
+ ret = false;
+ break;
+#endif
default:
ret = QWindowsStyle::styleHint(hint, option, widget, returnData);
break;