diff options
author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2014-03-04 17:52:09 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-20 19:01:53 +0100 |
commit | 23595107cd2366a86cf968578ddb17b827c7a596 (patch) | |
tree | ab07850ba35f1565877d8ddf1875718653cf95ed /src | |
parent | 80151389d6835629f746b0e61865b41d81a33feb (diff) |
Respect scrollbar position setting on Mac
This was a regression from Qt 4.7.
[ChangeLog][Widgets][QScrollArea] Respect scrollbar setting for
click-position on Mac.
Task-number: QTBUG-36314
Change-Id: I8bdb1aec9b308b0907f5db29d3519998bc843c18
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index d4b937ec03..c4e77425bd 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -2517,12 +2517,12 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w ret = 100; break; case SH_ScrollBar_LeftClickAbsolutePosition: { + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; + bool result = [defaults boolForKey:@"AppleScrollerPagingBehavior"]; if(QApplication::keyboardModifiers() & Qt::AltModifier) - ret = false; - //ret = !qt_scrollbar_jump_to_pos; + ret = !result; else - ret = true; - //ret = qt_scrollbar_jump_to_pos; + ret = result; break; } case SH_TabBar_PreferNoArrows: ret = true; |