Skip to content
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

Merged
merged 2 commits into from Jun 10, 2017
Merged

Conversation

@karmux
Copy link
Contributor

@karmux karmux commented May 21, 2017

Fixes #3568.

@@ -1627,11 +1627,11 @@ void AutomationEditor::wheelEvent(QWheelEvent * we )
int x = m_zoomingXModel.value();
if( we->delta() > 0 )
{
x--;
x++;
}
if( we->delta() < 0 )
Copy link
Contributor

@zapashcanon zapashcanon May 22, 2017

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...

}
if( we->delta() < 0 )
{
z++;
z--;
Copy link
Contributor

@zapashcanon zapashcanon May 22, 2017

Same here...

}
if( we->delta() < 0 )
{
z++;
z--;
Copy link
Contributor

@zapashcanon zapashcanon May 22, 2017

And here too.

@qnebra
Copy link

@qnebra qnebra commented May 27, 2017

Tested locally, lmms not crashing yet. LMB zoom in, RMB zoom out both on pianoroll and automation editor, and song editor too.

@Umcaruje Umcaruje added this to In Progress in Release 1.2.0 RC4 Jun 6, 2017
Copy link
Member

@zonkmachine zonkmachine left a comment

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.

@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Jun 10, 2017

Merge?

@Umcaruje Umcaruje merged commit ad2c843 into LMMS:stable-1.2 Jun 10, 2017
1 check passed
@zonkmachine zonkmachine moved this from In Progress to Done in Release 1.2.0 RC4 Jun 10, 2017
tresf added a commit to liushuyu/lmms that referenced this issue Jun 12, 2017
* Fixed inverted zooming.

* Prevent useless tests.
@tresf
Copy link
Member

@tresf tresf commented Jun 12, 2017

Cherry-picked and ready for master via 2652005.

PhysSong added a commit to PhysSong/lmms that referenced this issue Jul 8, 2017
* Fixed inverted zooming.

* Prevent useless tests.
PhysSong added a commit to PhysSong/lmms that referenced this issue Jul 8, 2017
* Fixed inverted zooming.

* Prevent useless tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants