mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl-osx fix: 'NSEvent' may not respond to '-magnification'

Browse Source 
(error: invalid operands of types 'float' and 'objc_object*' to binary 'operator+')

Change-Id: Iade7acde31fad21d7dde1a8c20c8900d9cbbd446
Reviewed-on: https://gerrit.libreoffice.org/8792
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Douglas Mencken
2014-03-30 08:52:41 -04:00
committed by Norbert Thiebaud
parent c2ed5f000e
commit f8f28ae91d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vcl/osx/salframeview.mm
View File

@@ -765,11 +765,19 @@ private:
if( bNewSeries ) if( bNewSeries )
mfMagnifyDeltaSum = 0.0; mfMagnifyDeltaSum = 0.0;
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
mfMagnifyDeltaSum += [pEvent deltaZ];
#else
mfMagnifyDeltaSum += [pEvent magnification]; mfMagnifyDeltaSum += [pEvent magnification];
#endif
mfLastMagnifyTime = [pEvent timestamp]; mfLastMagnifyTime = [pEvent timestamp];
// TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control // TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control
static const float fMagnifyFactor = 0.25*500; #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
static const float fMagnifyFactor = 0.25;
#else
static const float fMagnifyFactor = 0.25*500; // steps are 500 times smaller for -magnification
#endif
static const float fMinMagnifyStep = 15.0 / fMagnifyFactor; static const float fMinMagnifyStep = 15.0 / fMagnifyFactor;
if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep ) if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep )
return; return;