diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index d52f3bc24..fb9586c60 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -174,7 +174,7 @@ private: ComboBoxModel m_zoomingYModel; ComboBoxModel m_quantizeModel; - static const QVector m_zoomXLevels; + static const QVector m_zoomXLevels; FloatModel * m_tensionModel; diff --git a/include/PianoRoll.h b/include/PianoRoll.h index cda19cca0..50da94189 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -346,8 +346,8 @@ private: ComboBoxModel m_chordModel; ComboBoxModel m_snapModel; - static const QVector m_zoomLevels; - static const QVector m_zoomYLevels; + static const QVector m_zoomLevels; + static const QVector m_zoomYLevels; Pattern* m_pattern; NoteVector m_ghostNotes; diff --git a/include/PositionLine.h b/include/PositionLine.h index d48fd3df1..e9ec8c3d5 100644 --- a/include/PositionLine.h +++ b/include/PositionLine.h @@ -37,7 +37,7 @@ public: PositionLine(QWidget* parent); public slots: - void zoomChange(double zoom); + void zoomChange(float zoom); private: void paintEvent(QPaintEvent* pe) override; @@ -46,4 +46,4 @@ private: QColor m_lineColor; }; -#endif \ No newline at end of file +#endif diff --git a/include/SongEditor.h b/include/SongEditor.h index 9c59e3328..6c5f9eb6e 100644 --- a/include/SongEditor.h +++ b/include/SongEditor.h @@ -141,7 +141,7 @@ private: ComboBoxModel* m_snappingModel; bool m_proportionalSnap; - static const QVector m_zoomLevels; + static const QVector m_zoomLevels; bool m_scrollBack; bool m_smoothScroll; @@ -161,7 +161,7 @@ private: friend class SongEditorWindow; signals: - void zoomingValueChanged( double ); + void zoomingValueChanged( float ); } ; diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index ede66760c..ea880529c 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -71,7 +71,7 @@ QPixmap * AutomationEditor::s_toolMove = nullptr; QPixmap * AutomationEditor::s_toolYFlip = nullptr; QPixmap * AutomationEditor::s_toolXFlip = nullptr; -const QVector AutomationEditor::m_zoomXLevels = +const QVector AutomationEditor::m_zoomXLevels = { 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f }; diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index a8b0b373e..920504819 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -140,10 +140,10 @@ PianoRoll::PianoRollKeyTypes PianoRoll::prKeyOrder[] = const int DEFAULT_PR_PPB = DEFAULT_CELL_WIDTH * DefaultStepsPerBar; -const QVector PianoRoll::m_zoomLevels = +const QVector PianoRoll::m_zoomLevels = {0.125f, 0.25f, 0.5f, 1.0f, 1.5f, 2.0f, 4.0f, 8.0f}; -const QVector PianoRoll::m_zoomYLevels = +const QVector PianoRoll::m_zoomYLevels = {0.25f, 0.5f, 1.0f, 1.5f, 2.0f, 2.5f, 3.0f, 4.0f}; diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 5a148ff8a..17bac9498 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -54,7 +54,7 @@ #include "ToolTip.h" #include "Track.h" -const QVector SongEditor::m_zoomLevels = +const QVector SongEditor::m_zoomLevels = { 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f, 16.0f }; SongEditor::SongEditor( Song * song ) : @@ -99,8 +99,8 @@ SongEditor::SongEditor( Song * song ) : connect( m_song, SIGNAL( playbackStateChanged() ), m_positionLine, SLOT( update() ) ); - connect( this, SIGNAL( zoomingValueChanged( double ) ), - m_positionLine, SLOT( zoomChange( double ) ) ); + connect( this, SIGNAL( zoomingValueChanged( float ) ), + m_positionLine, SLOT( zoomChange( float ) ) ); // add some essential widgets to global tool-bar diff --git a/src/gui/widgets/PositionLine.cpp b/src/gui/widgets/PositionLine.cpp index ef003c5eb..978c94a96 100644 --- a/src/gui/widgets/PositionLine.cpp +++ b/src/gui/widgets/PositionLine.cpp @@ -87,7 +87,7 @@ void PositionLine::paintEvent(QPaintEvent* pe) // NOTE: the move() implementation fixes a bug where the position line would appear // in an unexpected location when positioned at the start of the track -void PositionLine::zoomChange(double zoom) +void PositionLine::zoomChange(float zoom) { int playHeadPos = x() + width() - 1; @@ -95,4 +95,4 @@ void PositionLine::zoomChange(double zoom) move(playHeadPos - width() + 1, y()); update(); -} \ No newline at end of file +}