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.

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

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

Merged
merged 6 commits into from
Apr 26, 2018
Merged

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

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebf1548
Limit the automation-editor scaled-level tooltip to the grid
Apr 21, 2018
d1dfe32
Tab to space
Apr 22, 2018
19b0342
Small improvement
Apr 22, 2018
d127517
Limit the automation-editor cross to the grid
Apr 24, 2018
d3dd76d
Revert "Limit the automation-editor cross to the grid"
Apr 25, 2018
9699ef1
Better coordinates check
Apr 25, 2018
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
24 changes: 18 additions & 6 deletions src/gui/editors/AutomationEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,23 +1076,35 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
inline void AutomationEditor::drawCross( QPainter & p )
{
QPoint mouse_pos = mapFromGlobal( QCursor::pos() );
float level = getLevel( mouse_pos.y() );
int grid_bottom = height() - SCROLLBAR_SIZE - 1;
float level = getLevel( mouse_pos.y() );
float cross_y = m_y_auto ?
grid_bottom - ( ( grid_bottom - TOP_MARGIN )
* ( level - m_minLevel )
/ (float)( m_maxLevel - m_minLevel ) ) :
grid_bottom - ( level - m_bottomLevel ) * m_y_delta;

int bottom_margin = height() - SCROLLBAR_SIZE;

p.setPen( crossColor() );
p.drawLine( VALUES_WIDTH, (int) cross_y, width(), (int) cross_y );
p.drawLine( mouse_pos.x(), TOP_MARGIN, mouse_pos.x(),
height() - SCROLLBAR_SIZE );
p.drawLine( mouse_pos.x(), TOP_MARGIN, mouse_pos.x(), bottom_margin );


QPoint tt_pos = QCursor::pos();
tt_pos.ry() -= 64;
tt_pos.rx() += 32;
tt_pos.ry() -= 51;
tt_pos.rx() += 26;

float scaledLevel = m_pattern->firstObject()->scaledValue( level );
QToolTip::showText( tt_pos, QString::number( scaledLevel ), this );

// Limit the scaled-level tooltip to the grid
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 )
{
QToolTip::showText( tt_pos, QString::number( scaledLevel ), this );
}
}


Expand Down