Skip to content

fixes position marker height on startup #3587

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.

Sign up for GitHub

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

Merged
tresf merged 2 commits into from
Jun 2, 2017
Merged

fixes position marker height on startup #3587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d8b8ed
fixes position marker height on startup
BaraMGB May 29, 2017
0f4d921
spacing I
BaraMGB Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/SongEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public slots:
void setEditModeSelect();

void updatePosition( const MidiTime & t );
void updatePositionLine();

protected:
virtual void closeEvent( QCloseEvent * ce );
Expand Down Expand Up @@ -152,6 +153,9 @@ class SongEditorWindow : public Editor

SongEditor* m_editor;

protected:
virtual void resizeEvent( QResizeEvent * event );

protected slots:
void play();
void record();
Expand All @@ -162,6 +166,7 @@ protected slots:

signals:
void playTriggered();
void resized();

private:
QAction* m_addBBTrackAction;
Expand Down
17 changes: 17 additions & 0 deletions src/gui/editors/SongEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,14 @@ void SongEditor::updatePosition( const MidiTime & t )



void SongEditor::updatePositionLine()
{
m_positionLine->setFixedHeight( height() );
}




void SongEditor::zoomingChanged()
{
setPixelsPerTact( m_zoomLevels[m_zoomingModel->value()] * DEFAULT_PIXELS_PER_TACT );
Expand Down Expand Up @@ -697,6 +705,7 @@ SongEditorWindow::SongEditorWindow(Song* song) :
zoomToolBar->addWidget( m_zoomingComboBox );

connect(song, SIGNAL(projectLoaded()), this, SLOT(adjustUiAfterProjectLoad()));
connect( this, SIGNAL(resized() ), m_editor, SLOT( updatePositionLine() ) );
Copy link
Member

@Umcaruje Umcaruje May 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please correct the formatting on this, either have or have not spaces in the parenthesis, but this mix-and-match looks inconsistent.

}

QSize SongEditorWindow::sizeHint() const
Expand All @@ -705,6 +714,14 @@ QSize SongEditorWindow::sizeHint() const
}




void SongEditorWindow::resizeEvent(QResizeEvent *event)
{
emit resized();
}


void SongEditorWindow::play()
{
emit playTriggered();
Expand Down