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

new button look 

git-svn-id: svn://localhost/ardour2/branches/3.0@13511 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2012-11-16 19:27:39 +00:00
parent 0b2359098f
commit 6b6ef35f3e
6 changed files with 120 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
gtk2_ardour/ardour3_ui_default.conf
View File

@ -146,10 +146,7 @@
<Option name="zero line" value="b5b5b525"/>
<Option name="zoom rect" value="c6d1b26d"/>
<Option name="monitor knob" value="329edfff"/>
<Option name="processor prefader: border start" value="630a0aff"/>
<Option name="processor prefader: border end" value="630a0aff"/>
<Option name="processor prefader: border start selected" value="edc400ff"/>
<Option name="processor prefader: border end selected" value="ffd300ff"/>
<Option name="button border" value="000000f0"/>
<Option name="processor prefader: fill start" value="873c3cff"/>
<Option name="processor prefader: fill end" value="542525ff"/>
<Option name="processor prefader: fill start active" value="873c3cff"/>
@ -158,10 +155,6 @@
<Option name="processor prefader: led active" value="78cb4eff"/>
<Option name="processor prefader: text" value="aaaaa3ff"/>
<Option name="processor prefader: text active" value="eeeeecff"/>
<Option name="processor fader: border start" value="7cb5d9ff"/>
<Option name="processor fader: border end" value="6493b0ff"/>
<Option name="processor fader: border start selected" value="cdfaf8ff"/>
<Option name="processor fader: border end selected" value="c0ebe9ff"/>
<Option name="processor fader: fill start" value="5d90b0ff"/>
<Option name="processor fader: fill end" value="154c6eff"/>
<Option name="processor fader: fill start active" value="5d90b0ff"/>
@ -170,10 +163,6 @@
<Option name="processor fader: led active" value="78cb4eff"/>
<Option name="processor fader: text" value="aaaaa3ff"/>
<Option name="processor fader: text active" value="eeeeecff"/>
<Option name="processor postfader: border start" value="1d631dff"/>
<Option name="processor postfader: border end" value="1d631dff"/>
<Option name="processor postfader: border start selected" value="46f046ff"/>
<Option name="processor postfader: border end selected" value="46f046ff"/>
<Option name="processor postfader: fill start" value="415947ff"/>
<Option name="processor postfader: fill end" value="202d23ff"/>
<Option name="processor postfader: fill start active" value="415947ff"/>
@ -182,10 +171,6 @@
<Option name="processor postfader: led active" value="78cb4eff"/>
<Option name="processor postfader: text" value="aaaaa3ff"/>
<Option name="processor postfader: text active" value="eeeeecff"/>
<Option name="processor control button: border start" value="000000ff"/>
<Option name="processor control button: border end" value="000000ff"/>
<Option name="processor control button: border start selected" value="000000ff"/>
<Option name="processor control button: border end selected" value="000000ff"/>
<Option name="processor control button: fill start" value="000000ff"/>
<Option name="processor control button: fill end" value="000000ff"/>
<Option name="processor control button: fill start active" value="000000ff"/>
@ -194,10 +179,6 @@
<Option name="processor control button: led active" value="ff0000ff"/>
<Option name="processor control button: text" value="ffffffff"/>
<Option name="processor control button: text active" value="ffffffff"/>
<Option name="monitor button: border start" value="889488ff"/>
<Option name="monitor button: border end" value="004f00ff"/>
<Option name="monitor button: border start selected" value="9a908eff"/>
<Option name="monitor button: border end selected" value="675c5bff"/>
<Option name="monitor button: fill start" value="5d5856ff"/>
<Option name="monitor button: fill end" value="564d48ff"/>
<Option name="monitor button: fill start active" value="46a344ff"/>
@ -206,10 +187,6 @@
<Option name="monitor button: led active" value="ff0000ff"/>
<Option name="monitor button: text" value="aaaaa3ff"/>
<Option name="monitor button: text active" value="1a1a1aff"/>
<Option name="solo isolate: border start" value="b7b7d2ff"/>
<Option name="solo isolate: border end" value="000000ff"/>
<Option name="solo isolate: border start selected" value="9a908eff"/>
<Option name="solo isolate: border end selected" value="675c5bff"/>
<Option name="solo isolate: fill start" value="5d5856ff"/>
<Option name="solo isolate: fill end" value="564d48ff"/>
<Option name="solo isolate: fill start active" value="5d5856ff"/>
@ -218,10 +195,6 @@
<Option name="solo isolate: led active" value="ff0000ff"/>
<Option name="solo isolate: text" value="c7c7d8ff"/>
<Option name="solo isolate: text active" value="c8c8d9ff"/>
<Option name="solo safe: border start" value="b7b7d2ff"/>
<Option name="solo safe: border end" value="000000ff"/>
<Option name="solo safe: border start selected" value="9a908eff"/>
<Option name="solo safe: border end selected" value="675c5bff"/>
<Option name="solo safe: fill start" value="5d5856ff"/>
<Option name="solo safe: fill end" value="564d48ff"/>
<Option name="solo safe: fill start active" value="5d5856ff"/>
@ -230,10 +203,6 @@
<Option name="solo safe: led active" value="ff0000ff"/>
<Option name="solo safe: text" value="c7c7d8ff"/>
<Option name="solo safe: text active" value="c8c8d9ff"/>
<Option name="monitor section cut: border start" value="b7b7d2ff"/>
<Option name="monitor section cut: border end" value="000000ff"/>
<Option name="monitor section cut: border start selected" value="9a908e00"/>
<Option name="monitor section cut: border end selected" value="675c5b00"/>
<Option name="monitor section cut: fill start" value="5d5856ff"/>
<Option name="monitor section cut: fill end" value="564d48ff"/>
<Option name="monitor section cut: fill start active" value="f7bb0aff"/>
@ -242,10 +211,6 @@
<Option name="monitor section cut: led active" value="78cb4eff"/>
<Option name="monitor section cut: text" value="c7c7d8ff"/>
<Option name="monitor section cut: text active" value="000000ff"/>
<Option name="monitor section dim: border start" value="b7b7d2ff"/>
<Option name="monitor section dim: border end" value="000000ff"/>
<Option name="monitor section dim: border start selected" value="9a908eff"/>
<Option name="monitor section dim: border end selected" value="675b5bff"/>
<Option name="monitor section dim: fill start" value="5d5856ff"/>
<Option name="monitor section dim: fill end" value="564d48ff"/>
<Option name="monitor section dim: fill start active" value="04af02ff"/>
@ -254,10 +219,6 @@
<Option name="monitor section dim: led active" value="78cb4eff"/>
<Option name="monitor section dim: text" value="c8c8d9ff"/>
<Option name="monitor section dim: text active" value="c8c8d9ff"/>
<Option name="monitor section solo: border start" value="b7b7d2ff"/>
<Option name="monitor section solo: border end" value="000000ff"/>
<Option name="monitor section solo: border start selected" value="9a908eff"/>
<Option name="monitor section solo: border end selected" value="675c5bff"/>
<Option name="monitor section solo: fill start" value="5d5856ff"/>
<Option name="monitor section solo: fill end" value="564d48ff"/>
<Option name="monitor section solo: fill start active" value="f4f395ff"/>
@ -266,10 +227,6 @@
<Option name="monitor section solo: led active" value="ffa500ff"/>
<Option name="monitor section solo: text" value="00000000"/>
<Option name="monitor section solo: text active" value="00000000"/>
<Option name="monitor section invert: border start" value="b7b7d2ff"/>
<Option name="monitor section invert: border end" value="000000ff"/>
<Option name="monitor section invert: border start selected" value="9a908eff"/>
<Option name="monitor section invert: border end selected" value="675c5b00"/>
<Option name="monitor section invert: fill start" value="5d5856ff"/>
<Option name="monitor section invert: fill end" value="564d48ff"/>
<Option name="monitor section invert: fill start active" value="03af01ff"/>
@ -278,10 +235,6 @@
<Option name="monitor section invert: led active" value="78cb4eff"/>
<Option name="monitor section invert: text" value="00000000"/>
<Option name="monitor section invert: text active" value="00000000"/>
<Option name="monitor section mono: border start" value="b7b7d2ff"/>
<Option name="monitor section mono: border end" value="000000ff"/>
<Option name="monitor section mono: border start selected" value="9a908eff"/>
<Option name="monitor section mono: border end selected" value="675c5bff"/>
<Option name="monitor section mono: fill start" value="5d5856ff"/>
<Option name="monitor section mono: fill end" value="564d48ff"/>
<Option name="monitor section mono: fill start active" value="04af02ff"/>
@ -290,10 +243,6 @@
<Option name="monitor section mono: led active" value="78cb4eff"/>
<Option name="monitor section mono: text" value="c7c7d8ff"/>
<Option name="monitor section mono: text active" value="c8c8d9ff"/>
<Option name="monitor section solo model: border start" value="b7b7d2ff"/>
<Option name="monitor section solo model: border end" value="000000ff"/>
<Option name="monitor section solo model: border start selected" value="9a908eff"/>
<Option name="monitor section solo model: border end selected" value="675c5bff"/>
<Option name="monitor section solo model: fill start" value="5d5856ff"/>
<Option name="monitor section solo model: fill end" value="564d48ff"/>
<Option name="monitor section solo model: fill start active" value="5d5856ff"/>
@ -302,10 +251,6 @@
<Option name="monitor section solo model: led active" value="ffa500ff"/>
<Option name="monitor section solo model: text" value="c7c7d8ff"/>
<Option name="monitor section solo model: text active" value="c8c8d9ff"/>
<Option name="monitor solo override: border start" value="b7b7d2ff"/>
<Option name="monitor solo override: border end" value="000000ff"/>
<Option name="monitor solo override: border start selected" value="9a908eff"/>
<Option name="monitor solo override: border end selected" value="675c5bff"/>
<Option name="monitor solo override: fill start" value="5d5856ff"/>
<Option name="monitor solo override: fill end" value="564d48ff"/>
<Option name="monitor solo override: fill start active" value="5d5856ff"/>
@ -314,10 +259,6 @@
<Option name="monitor solo override: led active" value="ffa500ff"/>
<Option name="monitor solo override: text" value="c7c7d8ff"/>
<Option name="monitor solo override: text active" value="c8c8d9ff"/>
<Option name="monitor solo exclusive: border start" value="b7b7d2ff"/>
<Option name="monitor solo exclusive: border end" value="000000ff"/>
<Option name="monitor solo exclusive: border start selected" value="9a908eff"/>
<Option name="monitor solo exclusive: border end selected" value="675c5bff"/>
<Option name="monitor solo exclusive: fill start" value="5d5856ff"/>
<Option name="monitor solo exclusive: fill end" value="564d48ff"/>
<Option name="monitor solo exclusive: fill start active" value="5d5856ff"/>
@ -326,10 +267,6 @@
<Option name="monitor solo exclusive: led active" value="ffa500ff"/>
<Option name="monitor solo exclusive: text" value="c7c7d8ff"/>
<Option name="monitor solo exclusive: text active" value="c8c8d9ff"/>
<Option name="rude solo: border start" value="997171ff"/>
<Option name="rude solo: border end" value="000000ff"/>
<Option name="rude solo: border start selected" value="000000ff"/>
<Option name="rude solo: border end selected" value="00000000"/>
<Option name="rude solo: fill start" value="684d4dff"/>
<Option name="rude solo: fill end" value="513c3cff"/>
<Option name="rude solo: fill start active" value="ff1f1fff"/>
@ -338,10 +275,6 @@
<Option name="rude solo: led active" value="00000000"/>
<Option name="rude solo: text" value="969696ff"/>
<Option name="rude solo: text active" value="e5e5e5ff"/>
<Option name="rude isolate: border start" value="8da8b4ff"/>
<Option name="rude isolate: border end" value="000000ff"/>
<Option name="rude isolate: border start selected" value="00000000"/>
<Option name="rude isolate: border end selected" value="000000ff"/>
<Option name="rude isolate: fill start" value="21414fff"/>
<Option name="rude isolate: fill end" value="192930ff"/>
<Option name="rude isolate: fill start active" value="e5f7ffff"/>
@ -350,10 +283,6 @@
<Option name="rude isolate: led active" value="000000ff"/>
<Option name="rude isolate: text" value="979797ff"/>
<Option name="rude isolate: text active" value="000000ff"/>
<Option name="rude audition: border start" value="997171ff"/>
<Option name="rude audition: border end" value="000000ff"/>
<Option name="rude audition: border start selected" value="00000000"/>
<Option name="rude audition: border end selected" value="000000ff"/>
<Option name="rude audition: fill start" value="684d4dff"/>
<Option name="rude audition: fill end" value="513c3cff"/>
<Option name="rude audition: fill start active" value="ff1f1fff"/>
@ -362,10 +291,6 @@
<Option name="rude audition: led active" value="00000000"/>
<Option name="rude audition: text" value="979797ff"/>
<Option name="rude audition: text active" value="ffffffff"/>
<Option name="feedback alert: border start" value="997171ff"/>
<Option name="feedback alert: border end" value="000000ff"/>
<Option name="feedback alert: border start selected" value="000000ff"/>
<Option name="feedback alert: border end selected" value="00000000"/>
<Option name="feedback alert: fill start" value="684d4dff"/>
<Option name="feedback alert: fill end" value="513c3cff"/>
<Option name="feedback alert: fill start active" value="ff1f1fff"/>
@ -374,10 +299,6 @@
<Option name="feedback alert: led active" value="00000000"/>
<Option name="feedback alert: text" value="969696ff"/>
<Option name="feedback alert: text active" value="e5e5e5ff"/>
<Option name="mute button: border start" value="ffc300ff"/>
<Option name="mute button: border end" value="856237ff"/>
<Option name="mute button: border start selected" value="00000000"/>
<Option name="mute button: border end selected" value="00000000"/>
<Option name="mute button: fill start" value="bf9a24ff"/>
<Option name="mute button: fill end" value="846137ff"/>
<Option name="mute button: fill start active" value="ffc300ff"/>
@ -386,10 +307,6 @@
<Option name="mute button: led active" value="00000000"/>
<Option name="mute button: text" value="bfbfbfff"/>
<Option name="mute button: text active" value="191919ff"/>
<Option name="solo button: border start" value="ffffffff"/>
<Option name="solo button: border end" value="4c5c2bff"/>
<Option name="solo button: border start selected" value="000000ff"/>
<Option name="solo button: border end selected" value="000000ff"/>
<Option name="solo button: fill start" value="a09865ff"/>
<Option name="solo button: fill end" value="4c5b2aff"/>
<Option name="solo button: fill start active" value="fffd9bff"/>
@ -398,10 +315,6 @@
<Option name="solo button: led active" value="00000000"/>
<Option name="solo button: text" value="bfbfbfff"/>
<Option name="solo button: text active" value="191919ff"/>
<Option name="record enable button: border start" value="a06969ff"/>
<Option name="record enable button: border end" value="000000ff"/>
<Option name="record enable button: border start selected" value="00000000"/>
<Option name="record enable button: border end selected" value="00000000"/>
<Option name="record enable button: fill start" value="603f3fff"/>
<Option name="record enable button: fill end" value="3d2828ff"/>
<Option name="record enable button: fill start active" value="fb0c0cff"/>
@ -410,10 +323,6 @@
<Option name="record enable button: led active" value="00000000"/>
<Option name="record enable button: text" value="a5a5a5ff"/>
<Option name="record enable button: text active" value="d8d8d8ff"/>
<Option name="send alert button: border start" value="9baa8dff"/>
<Option name="send alert button: border end" value="000000ff"/>
<Option name="send alert button: border start selected" value="00000000"/>
<Option name="send alert button: border end selected" value="00000000"/>
<Option name="send alert button: fill start" value="4e5647ff"/>
<Option name="send alert button: fill end" value="43493cff"/>
<Option name="send alert button: fill start active" value="91f928ff"/>
@ -422,10 +331,6 @@
<Option name="send alert button: led active" value="00000000"/>
<Option name="send alert button: text" value="ccccccff"/>
<Option name="send alert button: text active" value="000000ff"/>
<Option name="transport button: border start" value="9e9e9eff"/>
<Option name="transport button: border end" value="070707ff"/>
<Option name="transport button: border start selected" value="00000000"/>
<Option name="transport button: border end selected" value="00000000"/>
<Option name="transport button: fill start" value="656867ff"/>
<Option name="transport button: fill end" value="333333ff"/>
<Option name="transport button: fill start active" value="a1ff43ff"/>
@ -434,10 +339,6 @@
<Option name="transport button: led active" value="00000000"/>
<Option name="transport button: text" value="00000000"/>
<Option name="transport button: text active" value="00000000"/>
<Option name="transport recenable button: border start" value="a06a6aff"/>
<Option name="transport recenable button: border end" value="000000ff"/>
<Option name="transport recenable button: border start selected" value="000000ff"/>
<Option name="transport recenable button: border end selected" value="000000ff"/>
<Option name="transport recenable button: fill start" value="5f3f3fff"/>
<Option name="transport recenable button: fill end" value="3d2828ff"/>
<Option name="transport recenable button: fill start active" value="f80b0bff"/>
@ -446,10 +347,6 @@
<Option name="transport recenable button: led active" value="00000000"/>
<Option name="transport recenable button: text" value="00000000"/>
<Option name="transport recenable button: text active" value="00000000"/>
<Option name="transport option button: border start" value="9597a5ff"/>
<Option name="transport option button: border end" value="0f0f0fff"/>
<Option name="transport option button: border start selected" value="000000ff"/>
<Option name="transport option button: border end selected" value="282828ff"/>
<Option name="transport option button: fill start" value="636470ff"/>
<Option name="transport option button: fill end" value="4a4b51ff"/>
<Option name="transport option button: fill start active" value="636470ff"/>
@ -458,10 +355,6 @@
<Option name="transport option button: led active" value="ffa500ff"/>
<Option name="transport option button: text" value="c7c7d8ff"/>
<Option name="transport option button: text active" value="c8c8d9ff"/>
<Option name="transport active option button: border start" value="a9b2a9ff"/>
<Option name="transport active option button: border end" value="0c0c0cff"/>
<Option name="transport active option button: border start selected" value="8a998aff"/>
<Option name="transport active option button: border end selected" value="596359ff"/>
<Option name="transport active option button: fill start" value="606b60ff"/>
<Option name="transport active option button: fill end" value="555d54ff"/>
<Option name="transport active option button: fill start active" value="a1ff43ff"/>
@ -470,10 +363,6 @@
<Option name="transport active option button: led active" value="ffa500ff"/>
<Option name="transport active option button: text" value="c7c7d8ff"/>
<Option name="transport active option button: text active" value="000000ff"/>
<Option name="plugin bypass button: border start" value="b7b7d2ff"/>
<Option name="plugin bypass button: border end" value="000000ff"/>
<Option name="plugin bypass button: border start selected" value="9a908eff"/>
<Option name="plugin bypass button: border end selected" value="675c5bff"/>
<Option name="plugin bypass button: fill start" value="5d5856ff"/>
<Option name="plugin bypass button: fill end" value="564d48ff"/>
<Option name="plugin bypass button: fill start active" value="5d5856ff"/>
@ -482,10 +371,6 @@
<Option name="plugin bypass button: led active" value="ff0000ff"/>
<Option name="plugin bypass button: text" value="c7c7d8ff"/>
<Option name="plugin bypass button: text active" value="c8c8d9ff"/>
<Option name="punch button: border start" value="a06969ff"/>
<Option name="punch button: border end" value="000000ff"/>
<Option name="punch button: border start selected" value="000000ff"/>
<Option name="punch button: border end selected" value="000000ff"/>
<Option name="punch button: fill start" value="603f3fff"/>
<Option name="punch button: fill end" value="3d2828ff"/>
<Option name="punch button: fill start active" value="fb0c0cff"/>
@ -494,10 +379,6 @@
<Option name="punch button: led active" value="00000000"/>
<Option name="punch button: text" value="a5a5a5ff"/>
<Option name="punch button: text active" value="d8d8d8ff"/>
<Option name="mouse mode button: border start" value="b9db9aff"/>
<Option name="mouse mode button: border end" value="000000ff"/>
<Option name="mouse mode button: border start selected" value="9a908eff"/>
<Option name="mouse mode button: border end selected" value="675c5bff"/>
<Option name="mouse mode button: fill start" value="6e8755ff"/>
<Option name="mouse mode button: fill end" value="274e00ff"/>
<Option name="mouse mode button: fill start active" value="c5ff95ff"/>
@ -506,10 +387,6 @@
<Option name="mouse mode button: led active" value="ffa500ff"/>
<Option name="mouse mode button: text" value="c7c7d8ff"/>
<Option name="mouse mode button: text active" value="000000ff"/>
<Option name="zoom button: border start" value="9092a3ff"/>
<Option name="zoom button: border end" value="0a0a0aff"/>
<Option name="zoom button: border start selected" value="9a908eff"/>
<Option name="zoom button: border end selected" value="675c5bff"/>
<Option name="zoom button: fill start" value="626370ff"/>
<Option name="zoom button: fill end" value="4a4b51ff"/>
<Option name="zoom button: fill start active" value="4d4d4dff"/>
@ -518,10 +395,6 @@
<Option name="zoom button: led active" value="ffa500ff"/>
<Option name="zoom button: text" value="c7c7d8ff"/>
<Option name="zoom button: text active" value="c8c8d9ff"/>
<Option name="route button: border start" value="b7b7d2ff"/>
<Option name="route button: border end" value="000000ff"/>
<Option name="route button: border start selected" value="8e8e9aff"/>
<Option name="route button: border end selected" value="5b5b67ff"/>
<Option name="route button: fill start" value="56565dff"/>
<Option name="route button: fill end" value="484856ff"/>
<Option name="route button: fill start active" value="4d4d4dff"/>
@ -530,10 +403,6 @@
<Option name="route button: led active" value="ffa500ff"/>
<Option name="route button: text" value="c7c7d8ff"/>
<Option name="route button: text active" value="c8c8d9ff"/>
<Option name="mixer strip button: border start" value="b7b7d2ff"/>
<Option name="mixer strip button: border end" value="000000ff"/>
<Option name="mixer strip button: border start selected" value="9a908eff"/>
<Option name="mixer strip button: border end selected" value="675c5bff"/>
<Option name="mixer strip button: fill start" value="56565dff"/>
<Option name="mixer strip button: fill end" value="484856ff"/>
<Option name="mixer strip button: fill start active" value="ffd993ff"/>
@ -542,10 +411,6 @@
<Option name="mixer strip button: led active" value="ffa500ff"/>
<Option name="mixer strip button: text" value="c7c7d7ff"/>
<Option name="mixer strip button: text active" value="000000ff"/>
<Option name="mixer strip name button: border start" value="b7b7d2ff"/>
<Option name="mixer strip name button: border end" value="000000ff"/>
<Option name="mixer strip name button: border start selected" value="8e8e9aff"/>
<Option name="mixer strip name button: border end selected" value="5b5b67ff"/>
<Option name="mixer strip name button: fill start" value="56565dff"/>
<Option name="mixer strip name button: fill end" value="484856ff"/>
<Option name="mixer strip name button: fill start active" value="4d4d4dff"/>
@ -554,10 +419,6 @@
<Option name="mixer strip name button: led active" value="ffa500ff"/>
<Option name="mixer strip name button: text" value="c7c7d8ff"/>
<Option name="mixer strip name button: text active" value="c8c8d9ff"/>
<Option name="midi input button: border start" value="9e9e9eff"/>
<Option name="midi input button: border end" value="070707ff"/>
<Option name="midi input button: border start selected" value="00000000"/>
<Option name="midi input button: border end selected" value="00000000"/>
<Option name="midi input button: fill start" value="656867ff"/>
<Option name="midi input button: fill end" value="333333ff"/>
<Option name="midi input button: fill start active" value="a1ff43ff"/>

165
gtk2_ardour/ardour_button.cc
View File

@ -59,9 +59,12 @@ ArdourButton::ArdourButton (Element e)
, _diameter (11.0)
, _corner_radius (5.0)
, _corner_mask (0xf)
, edge_pattern (0)
, active_pattern (0)
, inactive_pattern (0)
, border_color (0)
, fill_color_active (0)
, fill_color_inactive (0)
, fill_pattern (0)
, fill_pattern_active (0)
, shine_pattern (0)
, led_inset_pattern (0)
, reflection_pattern (0)
, _led_rect (0)
@ -80,11 +83,14 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
, _text_width (0)
, _text_height (0)
, _diameter (11.0)
, _corner_radius (9.0)
, _corner_radius (5.0)
, _corner_mask (0xf)
, edge_pattern (0)
, active_pattern (0)
, inactive_pattern (0)
, border_color (0)
, fill_color_active (0)
, fill_color_inactive (0)
, fill_pattern (0)
, fill_pattern_active (0)
, shine_pattern (0)
, led_inset_pattern (0)
, reflection_pattern (0)
, _led_rect (0)
@ -101,17 +107,26 @@ ArdourButton::~ArdourButton()
{
delete _led_rect;
if (edge_pattern) {
cairo_pattern_destroy (edge_pattern);
if (shine_pattern) {
cairo_pattern_destroy (shine_pattern);
}
if (active_pattern) {
cairo_pattern_destroy (active_pattern);
if (fill_pattern) {
cairo_pattern_destroy (fill_pattern);
}
if (fill_pattern_active) {
cairo_pattern_destroy (fill_pattern_active);
}
if (led_inset_pattern) {
cairo_pattern_destroy (led_inset_pattern);
}
if (reflection_pattern) {
cairo_pattern_destroy (reflection_pattern);
}
if (inactive_pattern) {
cairo_pattern_destroy (inactive_pattern);
}
}
void
@ -169,9 +184,13 @@ ArdourButton::render (cairo_t* cr)
_diameter = std::min (get_width(), get_height());
}
float r,g,b,a;
if (_elements & Edge) {
rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
cairo_set_source (cr, edge_pattern);
UINT_TO_RGBA (border_color, &r, &g, &b, &a);
//cairo_set_source_rgba (cr, r/255.0,g/255.0,b/255.0,a/255.0); //TODO: why doesn't this work?
cairo_set_source_rgba (cr, 0,0,0,0.9);
cairo_fill (cr);
}
@ -179,21 +198,51 @@ ArdourButton::render (cairo_t* cr)
if (_elements & Edge) {
rounded_function (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius - 1.0);
} else {
rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius - 1.0);
rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
}
if (active_state() == Gtkmm2ext::ImplicitActive) {
cairo_set_source (cr, inactive_pattern);
//background color
cairo_set_source (cr, fill_pattern);
cairo_fill_preserve (cr);
//border
UINT_TO_RGBA (fill_color_active, &r, &g, &b, &a);
cairo_set_line_width (cr, 2.0);
cairo_set_source (cr, active_pattern);
// rounded_function (cr, 3, 3, get_width()-6, get_height()-6, _corner_radius - 1.0);
cairo_set_source_rgba (cr, r/255.0, g/255.0, b/255.0, a/255.0);
cairo_stroke (cr);
//reflection
if (!_flat_buttons) {
rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
cairo_set_source (cr, shine_pattern);
cairo_fill (cr);
}
} else if (active_state() == Gtkmm2ext::ExplicitActive) {
cairo_set_source (cr, active_pattern);
//background color
cairo_set_source (cr, fill_pattern_active);
cairo_fill (cr);
//reflection
if (!_flat_buttons) {
rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
cairo_set_source (cr, shine_pattern);
cairo_fill (cr);
}
} else {
cairo_set_source (cr, inactive_pattern);
//background color
cairo_set_source (cr, fill_pattern);
cairo_fill (cr);
//reflection
if (!_flat_buttons) {
rounded_function (cr, 2, 2, get_width()-4, get_height()/2-2, _corner_radius - 1.0);
cairo_set_source (cr, shine_pattern);
cairo_fill (cr);
}
}
}
@ -373,54 +422,34 @@ ArdourButton::set_colors ()
* color/pattern used there will vary depending on that
*/
if (edge_pattern) {
cairo_pattern_destroy (edge_pattern);
edge_pattern = 0;
fill_color_active = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
fill_color_inactive = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
border_color = ARDOUR_UI::config()->color_by_name ( "button border" );
if (shine_pattern) {
cairo_pattern_destroy (shine_pattern);
shine_pattern = 0;
}
if (_elements & Edge) {
edge_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
if (visual_state() & Gtkmm2ext::Selected) {
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start selected", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end selected", get_name()));
}
} else {
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", get_name()));
}
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (edge_pattern, 0, r/255.0,g/255.0,b/255.0, 0.7);
UINT_TO_RGBA (end_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (edge_pattern, 1, r/255.0,g/255.0,b/255.0, 0.7);
if (fill_pattern) {
cairo_pattern_destroy (fill_pattern);
fill_pattern = 0;
}
if (active_pattern) {
cairo_pattern_destroy (active_pattern);
active_pattern = 0;
}
if (inactive_pattern) {
cairo_pattern_destroy (inactive_pattern);
inactive_pattern = 0;
if (fill_pattern_active) {
cairo_pattern_destroy (fill_pattern_active);
fill_pattern_active = 0;
}
if (_elements & Body) {
active_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
shine_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()/2-2);
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
end_color = fill_color_active;
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
@ -429,21 +458,33 @@ ArdourButton::set_colors ()
active_b = b/255.0;
active_a = a/255.0;
cairo_pattern_add_color_stop_rgba (active_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
UINT_TO_RGBA (end_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (active_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
cairo_pattern_add_color_stop_rgba (shine_pattern, 0, 1,1,1,0.1);
cairo_pattern_add_color_stop_rgba (shine_pattern, 0.2, 1,1,1,0.4);
cairo_pattern_add_color_stop_rgba (shine_pattern, 1, 1,1,1,0.1);
inactive_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
end_color = fill_color_inactive;
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (inactive_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
cairo_pattern_add_color_stop_rgba (fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
UINT_TO_RGBA (end_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (inactive_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
cairo_pattern_add_color_stop_rgba (fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
fill_pattern_active = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
if (_flat_buttons) {
end_color = start_color;
} else {
end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (fill_pattern_active, 0, r/255.0,g/255.0,b/255.0, a/255.0);
UINT_TO_RGBA (end_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (fill_pattern_active, 1, r/255.0,g/255.0,b/255.0, a/255.0);
}
if (led_inset_pattern) {

9
gtk2_ardour/ardour_button.h
View File

@ -116,9 +116,12 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
float _corner_radius;
int _corner_mask;
cairo_pattern_t* edge_pattern;
cairo_pattern_t* active_pattern;
cairo_pattern_t* inactive_pattern;
uint32_t border_color;
uint32_t fill_color_active;
uint32_t fill_color_inactive;
cairo_pattern_t* fill_pattern;
cairo_pattern_t* fill_pattern_active;
cairo_pattern_t* shine_pattern;
cairo_pattern_t* led_inset_pattern;
cairo_pattern_t* reflection_pattern;

5
gtk2_ardour/canvas_vars.h
View File

@ -141,11 +141,8 @@ CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob")
CANVAS_VARIABLE(canvasvar_ButtonBorder, "border color")
#define BUTTON_VARS(root,name) \
CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name ": border start") \
CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name ": border end") \
CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name ": border start selected") \
CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name ": border end selected") \
CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name ": fill start") \
CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name ": fill end") \
CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name ": fill start active") \

15
gtk2_ardour/editor.cc
View File

@ -2905,22 +2905,19 @@ Editor::setup_toolbar ()
RefPtr<Action> act;
zoom_in_button.set_name ("zoom button");
zoom_in_button.set_image (::get_icon ("zoom_in"));
zoom_in_button.set_tweaks (ArdourButton::ShowClick);
zoom_in_button.add (*(manage (new Image (::get_icon ("zoom_in")))));
act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in"));
zoom_in_button.set_related_action (act);
act->connect_proxy (zoom_in_button);
zoom_out_button.set_name ("zoom button");
zoom_out_button.set_image (::get_icon ("zoom_out"));
zoom_out_button.set_tweaks (ArdourButton::ShowClick);
zoom_out_button.add (*(manage (new Image (::get_icon ("zoom_out")))));
act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-out"));
zoom_out_button.set_related_action (act);
act->connect_proxy (zoom_out_button);
zoom_out_full_button.set_name ("zoom button");
zoom_out_full_button.set_image (::get_icon ("zoom_full"));
zoom_out_full_button.set_tweaks (ArdourButton::ShowClick);
zoom_out_full_button.add (*(manage (new Image (::get_icon ("zoom_full")))));
act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));
zoom_out_full_button.set_related_action (act);
act->connect_proxy (zoom_out_full_button);
zoom_focus_selector.set_name ("ZoomFocusSelector");
set_popdown_strings (zoom_focus_selector, zoom_focus_strings);

6
gtk2_ardour/editor.h
View File

@ -1562,9 +1562,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void editor_list_button_toggled ();
AudioClock* zoom_range_clock;
ArdourButton zoom_in_button;
ArdourButton zoom_out_button;
ArdourButton zoom_out_full_button;
Gtk::Button zoom_in_button;
Gtk::Button zoom_out_button;
Gtk::Button zoom_out_full_button;
Gtk::Button tav_expand_button;
Gtk::Button tav_shrink_button;