ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

proper round corners for peak&gain display

This commit is contained in:
Robin Gareus 2014-08-31 12:08:39 +02:00
parent f6da7c67ab
commit 42e6c9c75d
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk2_ardour/ardour3_styles.rc.in
View File

@ -628,6 +628,8 @@ style "medium_bold_entry" = "medium_bold_text"
style "small_entry" = "small_text"
{
xthickness = 3
ythickness = 3
fg[NORMAL] = @@COLPREFIX@_text
fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
fg[SELECTED] = @@COLPREFIX@_fg_selected
@ -637,8 +639,8 @@ style "small_entry" = "small_text"
text[SELECTED] = @@COLPREFIX@_fg_selected
bg[NORMAL] = @@COLPREFIX@_base
bg[ACTIVE] = @@COLPREFIX@_base
bg[SELECTED] = @@COLPREFIX@_base
bg[SELECTED] = @@COLPREFIX@_bg_selected
base[NORMAL] = @@COLPREFIX@_base
base[ACTIVE] = @@COLPREFIX@_base
@ -647,8 +649,9 @@ style "small_entry" = "small_text"
style "red_active_small_entry" = "small_entry"
{
fg[ACTIVE] = @@COLPREFIX@_bright_indicator
fg[SELECTED] = @@COLPREFIX@_bright_indicator
fg[ACTIVE] = @@COLPREFIX@_text
fg[SELECTED] = @@COLPREFIX@_text
text[SELECTED] = @@COLPREFIX@_text
}
style "small_bold_entry" = "small_bold_text"
@ -905,25 +908,17 @@ style "paler_bright_when_active" = "medium_text"
bg[ACTIVE] = lighter(@@COLPREFIX@_bright_indicator)
}
style "peak_display_peaked_entry" = "small_text"
style "peak_display_peaked_entry" = "small_entry"
{
fg[NORMAL] = @@COLPREFIX@_text
fg[ACTIVE] = @@COLPREFIX@_text
fg[SELECTED] = @@COLPREFIX@_text
text[NORMAL] = @@COLPREFIX@_text
text[ACTIVE] = @@COLPREFIX@_text
text[SELECTED] = @@COLPREFIX@_text
bg[NORMAL] = @@COLPREFIX@_bright_indicator
bg[ACTIVE] = @@COLPREFIX@_bright_indicator
bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
bg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
bg[SELECTED] = @@COLPREFIX@_bright_indicator
base[NORMAL] = @@COLPREFIX@_bright_indicator
base[ACTIVE] = @@COLPREFIX@_bright_indicator
base[PRELIGHT] = @@COLPREFIX@_bright_indicator
base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
base[SELECTED] = @@COLPREFIX@_bright_indicator
base[NORMAL] = @@COLPREFIX@_bright_indicator
base[ACTIVE] = @@COLPREFIX@_bright_indicator
base[PRELIGHT] = @@COLPREFIX@_bright_indicator
base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
base[SELECTED] = @@COLPREFIX@_bright_indicator
}
style "selected_strip_frame"

2
gtk2_ardour/mixer_strip.cc
View File

@ -478,7 +478,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
gpm.set_type (rt->meter_type());
mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
mute_solo_table.attach (gpm.peak_display,1,2,1,2);
mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
if (solo_button->get_parent()) {
mute_solo_table.remove (*solo_button);