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
Fix heights of the time line in Automation Editor and Piano Roll 
The height of the time line in the Automation Editor and Piano Roll was
larger than the height in the Song Editor. This is fixed by specifying
the max-height in the stylesheet as well. Also the font-size is now
given in pt and the widget height in em so that the height of the whole
widget will always scale proportional to the given height of the font.
  • Loading branch information
@michaelgregorius
michaelgregorius committed Jun 4, 2016
commit 38ff02f54adaed342dc331cc7e0d1d567128a90e
11 changes: 9 additions & 2 deletions data/themes/default/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,15 @@ TimeLine {
}

TimeLineWidget {
font-size: 1em;
min-height: 1.25em;
/* font-size only supports px and pt. */
font-size: 7pt;
/* lengths also support em. This will make sure that the height
will always change in the same proportion as the font size
defined above.
If you want a fixed size set min and max to the same value. */
min-height: 1.5em;
max-height: 1.5em;

Copy link
Copy Markdown
Member

@Umcaruje Umcaruje Mar 11, 2016

Choose a reason for hiding this comment

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

You want to add this here:

    background-color: qlineargradient( x1: 0, y1: 0, x2: 0, y2: 1,
                        stop: 0 #8796a7, stop: 1.0 #3e454e );

to reinstate the old look.

Also, shouldn't

TimeLine {
    font-size: 8px;
}

be removed?

Copy link
Copy Markdown
Contributor Author

@michaelgregorius michaelgregorius Mar 11, 2016

Choose a reason for hiding this comment

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

I have reinstated the old look. I have to admit that I like the flat look better but that's something for theme designers I guess. :)

I have also removed the TimeLine entry from the style.css.

qproperty-inactiveLoopColor: rgba( 255, 255, 255, 32 );
qproperty-activeLoopColor: rgba( 255, 255, 255, 64 );
qproperty-barLineColor: rgb( 192, 192, 192 );
Expand Down