summaryrefslogtreecommitdiff
path: root/vcl/aqua
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-06 23:21:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-11-07 10:58:39 +0000
commit2efa35a812a6f1e35e4959a357f50feff7e598f5 (patch)
treed0776e997922a1ab0db17ad474be483903dfbd54 /vcl/aqua
parentb634cd4473bcd8170bfd7d53596893e65208ad88 (diff)
Resolves: fdo#56198 collect scrollbar click preference settings
for gtk and merge with aqua equivalent so as to alternate "jump to here" behavior for primary button vs primary means scroll by single page. Secondary button takes the alternative behaviour Change-Id: I0a96f3131f41ec87052da39cbe96bfd895ca53f6
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/window/salframe.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 924210d56911..cf7c048fe3a6 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1146,7 +1146,7 @@ rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
// -----------------------------------------------------------------------
-static void getAppleScrollBarVariant(void)
+static void getAppleScrollBarVariant(StyleSettings &rSettings)
{
bool bIsScrollbarDoubleMax = true; // default is DoubleMax
@@ -1183,7 +1183,7 @@ static void getAppleScrollBarVariant(void)
if( jumpStr )
{
if( CFGetTypeID( jumpStr ) == CFBooleanGetTypeID() )
- ImplGetSVData()->maNWFData.mbScrollbarJumpPage = (jumpStr == kCFBooleanTrue);
+ rSettings.SetPrimaryButtonWarpsSlider(jumpStr == kCFBooleanTrue);
CFRelease( jumpStr );
}
CFRelease( jumpScroll );
@@ -1324,7 +1324,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
// no mnemonics on aqua
aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_NOMNEMONICS );
- getAppleScrollBarVariant();
+ getAppleScrollBarVariant(aStyleSettings);
// set scrollbar size
aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) );