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

Limit the automation-editor scaled-level tooltip to the grid #4308

Merged
merged 6 commits into from
Apr 26, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion include/AutomationEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ protected slots:

// some constants...
static const int SCROLLBAR_SIZE = 12;
static const int LEFT_MARGIN = 63;
static const int TOP_MARGIN = 16;

static const int DEFAULT_Y_DELTA = 6;
Expand Down
5 changes: 2 additions & 3 deletions src/gui/editors/AutomationEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,6 @@ inline void AutomationEditor::drawCross( QPainter & p )
/ (float)( m_maxLevel - m_minLevel ) ) :
grid_bottom - ( level - m_bottomLevel ) * m_y_delta;

int right_margin = width() - SCROLLBAR_SIZE;
int bottom_margin = height() - SCROLLBAR_SIZE;

p.setPen( crossColor() );
Expand All @@ -1099,8 +1098,8 @@ inline void AutomationEditor::drawCross( QPainter & p )
float scaledLevel = m_pattern->firstObject()->scaledValue( level );

// Limit the scaled-level tooltip to the grid
if( mouse_pos.x() > LEFT_MARGIN &&
mouse_pos.x() < right_margin &&
if( mouse_pos.x() > VALUES_WIDTH - 1 && // left_margin
Copy link
Member

Choose a reason for hiding this comment

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

I think VALUES_WIDTH would be better, because it matches the limit area to where you can edit points.

Copy link
Member Author

Choose a reason for hiding this comment

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

At VALUES_WIDTH - 1, the cross' vertical line is visible, so the scaled-level tooltip should show there.

mouse_pos.x() < width() - SCROLLBAR_SIZE && // right_margin
mouse_pos.y() > TOP_MARGIN &&
mouse_pos.y() < bottom_margin )
{
Expand Down