[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - 4 commits - vcl/osx vcl/quartz
Caolán McNamara
caolanm at redhat.com
Tue Feb 6 14:28:16 UTC 2018
vcl/osx/salframeview.mm | 21 ++++++++++++---------
vcl/osx/salnativewidgets.cxx | 2 +-
vcl/osx/vclnsapp.mm | 5 +++++
vcl/quartz/ctfonts.cxx | 2 +-
4 files changed, 19 insertions(+), 11 deletions(-)
New commits:
commit f25e67d64b9e90ff2725ca29fc7445e9c63e0b2a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 20 20:01:13 2018 +0000
tdf#109062 restore osx scrollwheel logic
to pre
commit f7d2bf216afa10268e6a7c1d4613a2fd8f7c7f3c
Date: Tue May 16 10:12:09 2017 +0100
Resolves: tdf#103174 & rhbz#1367846 improve gtk3 trackpad scrolling
state.
Change-Id: If5a494441731e73136158b4905c2744ba8bc8875
Reviewed-on: https://gerrit.libreoffice.org/48306
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 378d7d68d9e842039bcf797a8b95c2e85768e1e7)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 7a5a04ca9f7a32659774362e225dd6f0bd8840ed)
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 1b16485edcff..91f8e06118a2 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -809,9 +809,10 @@ private:
if( aEvent.mnDelta == 0 )
aEvent.mnDelta = aEvent.mnNotchDelta;
aEvent.mbHorz = FALSE;
- aEvent.mnScrollLines = nDeltaZ;
- if( aEvent.mnScrollLines == 0 )
- aEvent.mnScrollLines = 1;
+ sal_uInt32 nScrollLines = nDeltaZ;
+ if (nScrollLines == 0)
+ nScrollLines = 1;
+ aEvent.mnScrollLines = nScrollLines;
mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent );
}
}
@@ -933,9 +934,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
if( aEvent.mnDelta == 0 )
aEvent.mnDelta = aEvent.mnNotchDelta;
aEvent.mbHorz = TRUE;
- aEvent.mnScrollLines = fabs(dX) / WHEEL_EVENT_FACTOR;
- if( aEvent.mnScrollLines == 0 )
- aEvent.mnScrollLines = 1;
+ sal_uInt32 nScrollLines = fabs(dX) / WHEEL_EVENT_FACTOR;
+ if (nScrollLines == 0)
+ nScrollLines = 1;
+ aEvent.mnScrollLines = nScrollLines;
mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent );
}
@@ -946,9 +948,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
if( aEvent.mnDelta == 0 )
aEvent.mnDelta = aEvent.mnNotchDelta;
aEvent.mbHorz = FALSE;
- aEvent.mnScrollLines = fabs(dY) / WHEEL_EVENT_FACTOR;
- if( aEvent.mnScrollLines == 0 )
- aEvent.mnScrollLines = 1;
+ sal_uInt32 nScrollLines = fabs(dY) / WHEEL_EVENT_FACTOR;
+ if (nScrollLines == 0)
+ nScrollLines = 1;
+ aEvent.mnScrollLines = nScrollLines;
mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent );
}
commit 64f60cacd6b8ac0b091f1207e806887dc44def19
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jan 23 15:04:00 2018 +0200
tdf#69254: Tweak mapping from CoreText weight to our FontWeight a bit
Make the mapping of light weights more likely to hit different enum
values for slightly different weights.
We want to be able to distinguish between for instance Overpass Light
(with weight -0.4) and Overpass ExtraLight (with weight -0.5).
Change-Id: If83fbce68149b267a49ef9bcb6624d8790de7c56
Reviewed-on: https://gerrit.libreoffice.org/48426
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
(cherry picked from commit 3aeda82b09253d20d234d50b39e76977031f2102)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 1476d4a10723c20f1cf1be3b6746c891ca21adf8)
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index dd64b7a0c5a8..0a018fd460f1 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -420,7 +420,7 @@ FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFont
}
else if( fWeight < 0 )
{
- nInt = rint(WEIGHT_NORMAL + fWeight * ((WEIGHT_NORMAL - WEIGHT_THIN)/0.9));
+ nInt = rint(WEIGHT_NORMAL + fWeight * ((WEIGHT_NORMAL - WEIGHT_THIN)/0.8));
if( nInt < WEIGHT_THIN )
{
nInt = WEIGHT_THIN;
commit aabfbe990de0097836d20ef2efa74e747a247007
Author: Telesto <telesto at surfxs.nl>
Date: Mon Jan 22 16:49:21 2018 +0200
tdf#112153: Set button theme properly
Change-Id: I0665880c0d0348fcbb3bcf04d9172405c8e31eb7
Reviewed-on: https://gerrit.libreoffice.org/48334
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
(cherry picked from commit 44af50465a02b6f5566be45913a34fdbdba90133)
Reviewed-on: https://gerrit.libreoffice.org/48385
(cherry picked from commit 2b6db99279fcfbbe3ba3720f92c36b8ecd49635a)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 6c377a8738168df9c22696cd28d3bbc57b152137)
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index a9d263f3c476..178a18db6357 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -106,11 +106,11 @@ static ThemeButtonValue ImplGetButtonValue( ButtonValue aButtonValue )
break;
case ButtonValue::Off:
+ case ButtonValue::DontKnow:
return kThemeButtonOff;
break;
case ButtonValue::Mixed:
- case ButtonValue::DontKnow:
default:
return kThemeButtonMixed;
break;
commit 7aab88ca7c0a499944f6abb83ba741f2146fd3f6
Author: Telesto <telesto at surfxs.nl>
Date: Mon Jan 22 15:16:52 2018 +0200
tdf#114985: Tell NSWindow to never use automatic window tabbing
Based on https://codereview.chromium.org/2325313002/
Reviewed-on: https://gerrit.libreoffice.org/48330
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
(cherry picked from commit ce88f2a7374bb8c53d57e8263e0701db19d62f30)
Reviewed-on: https://gerrit.libreoffice.org/48384
(cherry picked from commit 5163257c0d194f534887d92c6c9658640eeef3e1)
Signed-off-by: Andras Timar <andras.timar at collabora.com>
Change-Id: I8838449d57b1d1b010491a405c87645d38199fdf
(cherry picked from commit be97780787913e0311888d0031b86c8a552e9973)
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 4c38466961b0..25a83c74b278 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -75,6 +75,11 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
SAL_WNODEPRECATED_DECLARATIONS_POP
if( pEvent )
[NSApp postEvent: pEvent atStart: NO];
+
+ if( [NSWindow respondsToSelector:@selector(allowsAutomaticWindowTabbing)] )
+ {
+ NSWindow.allowsAutomaticWindowTabbing = NO;
+ }
}
-(void)sendEvent:(NSEvent*)pEvent
More information about the Libreoffice-commits
mailing list