diff options
| author | aavit <qt-info@nokia.com> | 2011-03-15 08:20:19 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-03-15 08:20:19 (GMT) |
| commit | 3c20b3ed8e89e351f1fb459e6ff5439f30958141 (patch) | |
| tree | 2cae81c1eaa9f38de997a09aca5340978734ee07 /src/gui/styles/qmacstyle_mac.mm | |
| parent | 25a30c8e258df642a1aa2ffcfb162633611e7259 (diff) | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| download | Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.zip Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.gz Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.bz2 | |
Merge remote branch 'qt-mainline/master'
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index ac05789..64722c7 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -4621,6 +4621,13 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex tdi.attributes &= ~kThemeTrackShowThumb; if (scrollBarLength < scrollButtonsCutoffSize(scrollButtonsCutoff, sizePolicy)) tdi.enableState = kThemeTrackNothingToScroll; + } else { + if (!(slider->subControls & SC_SliderHandle)) + tdi.attributes &= ~kThemeTrackShowThumb; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if (!(slider->subControls & SC_SliderGroove)) + tdi.attributes |= kThemeTrackHideTrack; +#endif } HIThemeDrawTrack(&tdi, tracking ? 0 : &macRect, cg, |