Skip to content

Implements #2635: Draws a transparent rectangle in the loop area (plus CSS exposure) #2657

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
michaelgregorius merged 14 commits into from
Jun 12, 2016
Merged

Implements #2635: Draws a transparent rectangle in the loop area (plus CSS exposure) #2657

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
740a6d9
Draws a transparent rectangle in the loop area (plus CSS exposure)
michaelgregorius Mar 9, 2016
92b273a
Enable setting the background of the time line from the stylesheet
michaelgregorius Mar 9, 2016
ce20dad
Implements some remarks from code reviews
michaelgregorius Mar 9, 2016
38ff02f
Fix heights of the time line in Automation Editor and Piano Roll
michaelgregorius Mar 10, 2016
f41b74b
Implements some remarks from a code review
michaelgregorius Mar 11, 2016
cba2305
Draw numbers in the time line more centered
michaelgregorius May 3, 2016
c856205
Draw the loop rectangle behind everything and use a green color
michaelgregorius May 4, 2016
6003bd0
Add more properties for the loop rectangle and remove the old pixmaps
michaelgregorius May 8, 2016
20eb51c
Change the order in which the elements of the loop rectangle are drawn
michaelgregorius May 8, 2016
069ca95
Bring back the playhead marker
michaelgregorius May 8, 2016
ca6e8f0
Add a padding property for the loop rectangle / document the style sheet
michaelgregorius May 9, 2016
e8b8f66
Remove the gradient for the TimeLineWidget in the new default theme
michaelgregorius Jun 4, 2016
81b9302
Remove borders and gradients for the loop rectangle in the default theme
michaelgregorius Jun 5, 2016
8981310
Change color of inactive loop rectangles to #3B424A
michaelgregorius Jun 5, 2016
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
Prev Previous commit
Next Next commit
Change the order in which the elements of the loop rectangle are drawn 
Draw the inner fill first, then lines and bar numbers and finally draw the
outlines (inner and outer).
  • Loading branch information
@michaelgregorius
michaelgregorius committed Jun 4, 2016
commit 20eb51c014f58c0aa1c78819a06d3563558d9a7a
23 changes: 13 additions & 10 deletions src/gui/TimeLineWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,9 @@ void TimeLineWidget::paintEvent( QPaintEvent * )

bool const loopPointsActive = loopPointsEnabled();

// Draw the main rectangle (outer border with inner fill)
p.setPen( loopPointsActive ? getActiveLoopColor() : getInactiveLoopColor() );
p.setBrush( loopPointsActive ? getActiveLoopBrush() : getInactiveLoopBrush() );
// Draw the main rectangle (inner fill only)
QRect outerRectangle( loopStart, loopRectMargin, loopRectWidth - 1, loopRectHeight - 1 );
p.drawRect( outerRectangle );

// Draw the inner border outline (no fill)
QRect innerRectangle = outerRectangle.adjusted( 1, 1, -1, -1 );
p.setPen( loopPointsActive ? getActiveLoopInnerColor() : getInactiveLoopInnerColor() );
p.setBrush(Qt::NoBrush);
p.drawRect( innerRectangle );
p.fillRect( outerRectangle, loopPointsActive ? getActiveLoopBrush() : getInactiveLoopBrush());

// Draw the bar lines and numbers
// Activate hinting on the font
Expand Down Expand Up @@ -273,6 +265,17 @@ void TimeLineWidget::paintEvent( QPaintEvent * )
p.drawText( cx + 5, ((height() - fontHeight) / 2) + fontAscent, s );
}
}

// Draw the main rectangle (outer border)
p.setPen( loopPointsActive ? getActiveLoopColor() : getInactiveLoopColor() );
p.setBrush( Qt::NoBrush );
p.drawRect( outerRectangle );

// Draw the inner border outline (no fill)
QRect innerRectangle = outerRectangle.adjusted( 1, 1, -1, -1 );
p.setPen( loopPointsActive ? getActiveLoopInnerColor() : getInactiveLoopInnerColor() );
p.setBrush(Qt::NoBrush);
Copy link
Member

@Umcaruje Umcaruje May 8, 2016

Choose a reason for hiding this comment

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

I'd add spaces in the parentheses here, so its consistent with the rest of the file.

Copy link
Contributor Author

@michaelgregorius michaelgregorius May 8, 2016

Choose a reason for hiding this comment

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

Done with commit 83fffcc.

p.drawRect( innerRectangle );
}


Expand Down