-
-
Notifications
You must be signed in to change notification settings - Fork 1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed inverted zooming. #3570
Fixed inverted zooming. #3570
Conversation
src/gui/editors/AutomationEditor.cpp
Outdated
@@ -1627,11 +1627,11 @@ void AutomationEditor::wheelEvent(QWheelEvent * we ) | |||
int x = m_zoomingXModel.value(); | |||
if( we->delta() > 0 ) | |||
{ | |||
x--; | |||
x++; | |||
} | |||
if( we->delta() < 0 ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
else if( we->delta() < 0 )
Will prevent one useless test when x > 0
. I know it's not directly related to this PR, but spotted this so...
src/gui/editors/PianoRoll.cpp
Outdated
} | ||
if( we->delta() < 0 ) | ||
{ | ||
z++; | ||
z--; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here...
src/gui/editors/SongEditor.cpp
Outdated
} | ||
if( we->delta() < 0 ) | ||
{ | ||
z++; | ||
z--; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And here too.
Tested locally, lmms not crashing yet. LMB zoom in, RMB zoom out both on pianoroll and automation editor, and song editor too. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I seem to be the only one bothered by the opposite action of the mouse wheel scrolling when zooming in the editor versus scrolling over the combo box. I'm happy to revert back to the original behaviour since the majority seem to be in favour of it. Code looks fine.
Merge? |
* Fixed inverted zooming. * Prevent useless tests.
Cherry-picked and ready for master via 2652005. |
* Fixed inverted zooming. * Prevent useless tests.
* Fixed inverted zooming. * Prevent useless tests.
* Fixed inverted zooming. * Prevent useless tests.
Fixes #3568.