From c0cf119c0d0dedbfa9008cb038ccb4d5e216fa91 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Wed, 18 Jan 2017 16:59:53 +0100 Subject: [PATCH] Fix inverted zoom direction (#3273) --- src/gui/editors/AutomationEditor.cpp | 2 +- src/gui/editors/PianoRoll.cpp | 2 +- src/gui/editors/SongEditor.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index 7ff86dbb2..87ecb927d 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -76,7 +76,7 @@ QPixmap * AutomationEditor::s_toolYFlip = NULL; QPixmap * AutomationEditor::s_toolXFlip = NULL; const QVector AutomationEditor::m_zoomXLevels = - { 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f }; + { 8.0f, 4.0f, 2.0f, 1.0f, 0.5f, 0.25f, 0.125f }; diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 04def6b9c..faaa71c54 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -153,7 +153,7 @@ PianoRoll::PianoRollKeyTypes PianoRoll::prKeyOrder[] = const int DEFAULT_PR_PPT = KEY_LINE_HEIGHT * DefaultStepsPerTact; const QVector PianoRoll::m_zoomLevels = - { 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f }; + { 8.0f, 4.0f, 2.0f, 1.0f, 0.5f, 0.25f, 0.125f }; PianoRoll::PianoRoll() : diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 9f51e8f42..0ba8e0381 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -75,7 +75,7 @@ void positionLine::paintEvent( QPaintEvent * pe ) } const QVector SongEditor::m_zoomLevels = - { 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f, 16.0f }; + { 16.0f, 8.0f, 4.0f, 2.0f, 1.0f, 0.5f, 0.25f, 0.125f }; SongEditor::SongEditor( Song * song ) :