View | Details | Raw Unified | Return to issue 124191
Collapse All | Expand All

(-)file_not_specified_in_diff (-11 / +11 lines)
Line  Link Here
0
-- main/vcl/aqua/source/window/salframeview.mm
0
++ main/vcl/aqua/source/window/salframeview.mm
Lines 803-810 private: Link Here
803
        mpFrame->mnLastModifierFlags = [pEvent modifierFlags];
803
        mpFrame->mnLastModifierFlags = [pEvent modifierFlags];
804
        
804
        
805
        // merge pending scroll wheel events
805
        // merge pending scroll wheel events
806
        float dX = 0.0;
806
        CGFloat dX = 0.0;
807
        float dY = 0.0;
807
        CGFloat dY = 0.0;
808
        for(;;)
808
        for(;;)
809
        {
809
        {
810
            dX += [pEvent deltaX];
810
            dX += [pEvent deltaX];
Lines 833-839 private: Link Here
833
        if( dX != 0.0 )
833
        if( dX != 0.0 )
834
        {
834
        {
835
            aEvent.mnDelta = static_cast<long>(floor(dX));
835
            aEvent.mnDelta = static_cast<long>(floor(dX));
836
            aEvent.mnNotchDelta = dX < 0 ? -1 : 1;
836
            aEvent.mnNotchDelta = (dX < 0) ? -1 : +1;
837
            if( aEvent.mnDelta == 0 )
837
            if( aEvent.mnDelta == 0 )
838
                aEvent.mnDelta = aEvent.mnNotchDelta;
838
                aEvent.mnDelta = aEvent.mnNotchDelta;
839
            aEvent.mbHorz = TRUE;
839
            aEvent.mbHorz = TRUE;
Lines 843-849 private: Link Here
843
        if( dY != 0.0 && AquaSalFrame::isAlive( mpFrame ))
843
        if( dY != 0.0 && AquaSalFrame::isAlive( mpFrame ))
844
        {
844
        {
845
            aEvent.mnDelta = static_cast<long>(floor(dY));
845
            aEvent.mnDelta = static_cast<long>(floor(dY));
846
            aEvent.mnNotchDelta = dY < 0 ? -1 : 1;
846
            aEvent.mnNotchDelta = (dY < 0) ? -1 : +1;
847
            if( aEvent.mnDelta == 0 )
847
            if( aEvent.mnDelta == 0 )
848
                aEvent.mnDelta = aEvent.mnNotchDelta;
848
                aEvent.mnDelta = aEvent.mnNotchDelta;
849
            aEvent.mbHorz = FALSE;
849
            aEvent.mbHorz = FALSE;
Lines 863-870 private: Link Here
863
        mpFrame->mnLastModifierFlags = [pEvent modifierFlags];
863
        mpFrame->mnLastModifierFlags = [pEvent modifierFlags];
864
864
865
        // merge pending scroll wheel events
865
        // merge pending scroll wheel events
866
        float dX = 0.0;
866
        CGFloat dX = 0.0;
867
        float dY = 0.0;
867
        CGFloat dY = 0.0;
868
        for(;;)
868
        for(;;)
869
        {
869
        {
870
            dX += [pEvent deltaX];
870
            dX += [pEvent deltaX];
Lines 893-903 private: Link Here
893
        if( dX != 0.0 )
893
        if( dX != 0.0 )
894
        {
894
        {
895
            aEvent.mnDelta = static_cast<long>(floor(dX));
895
            aEvent.mnDelta = static_cast<long>(floor(dX));
896
            aEvent.mnNotchDelta = dX < 0 ? -1 : 1;
896
            aEvent.mnNotchDelta = (dX < 0) ? -1 : +1;
897
            if( aEvent.mnDelta == 0 )
897
            if( aEvent.mnDelta == 0 )
898
                aEvent.mnDelta = aEvent.mnNotchDelta;
898
                aEvent.mnDelta = aEvent.mnNotchDelta;
899
            aEvent.mbHorz = TRUE;
899
            aEvent.mbHorz = TRUE;
900
            aEvent.mnScrollLines = dY > 0 ? dX/WHEEL_EVENT_FACTOR : -dX/WHEEL_EVENT_FACTOR;
900
            aEvent.mnScrollLines = (dX > 0) ? +dX/WHEEL_EVENT_FACTOR : -dX/WHEEL_EVENT_FACTOR;
901
            if( aEvent.mnScrollLines == 0 )
901
            if( aEvent.mnScrollLines == 0 )
902
                aEvent.mnScrollLines = 1;
902
                aEvent.mnScrollLines = 1;
903
903
Lines 906-916 private: Link Here
906
        if( dY != 0.0 && AquaSalFrame::isAlive( mpFrame ) )
906
        if( dY != 0.0 && AquaSalFrame::isAlive( mpFrame ) )
907
        {
907
        {
908
            aEvent.mnDelta = static_cast<long>(floor(dY));
908
            aEvent.mnDelta = static_cast<long>(floor(dY));
909
            aEvent.mnNotchDelta = dY < 0 ? -1 : 1;
909
            aEvent.mnNotchDelta = (dY < 0) ? -1 : +1;
910
            if( aEvent.mnDelta == 0 )
910
            if( aEvent.mnDelta == 0 )
911
                aEvent.mnDelta = aEvent.mnNotchDelta;
911
                aEvent.mnDelta = aEvent.mnNotchDelta;
912
            aEvent.mbHorz = FALSE;
912
            aEvent.mbHorz = FALSE;
913
            aEvent.mnScrollLines = dY > 0 ? dY/WHEEL_EVENT_FACTOR : -dY/WHEEL_EVENT_FACTOR;
913
            aEvent.mnScrollLines = (dY > 0) ? +dY/WHEEL_EVENT_FACTOR : -dY/WHEEL_EVENT_FACTOR;
914
            if( aEvent.mnScrollLines < 1 )
914
            if( aEvent.mnScrollLines < 1 )
915
                aEvent.mnScrollLines = 1;
915
                aEvent.mnScrollLines = 1;
916
916

Return to issue 124191