diff options
| author | David Robillard <d@drobilla.net> | 2008-10-05 02:00:43 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-05 02:00:43 +0000 |
| commit | f3252f65856d5684ffc89758425bd5fd2209d650 (patch) | |
| tree | a883455e63d4886de16c6cc690e8ecad8dc10b29 | |
| parent | 47638b66441b1ce8aebbed4f702600cc39cc302b (diff) | |
Commit the colours I thought I was committing the last time.
git-svn-id: svn://localhost/ardour2/branches/3.0@3861 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour3_ui_dark.rc.in | 7 | ||||
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index 49d52386cf..6eeef84077 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -99,8 +99,8 @@ style "default_base" = "medium_text" fg[INSENSITIVE] = { 0.80, 0.80, 0.80 } fg[SELECTED] = { 0.80, 0.80, 0.80 } - bg[NORMAL] = { 0.31, 0.32, 0.38 } - bg[ACTIVE] = { 0.31, 0.32, 0.38 } + bg[NORMAL] = { 0.30, 0.32, 0.38 } + bg[ACTIVE] = { 0.30, 0.32, 0.38 } bg[PRELIGHT] = "#515290" bg[INSENSITIVE] = { 0.06, 0.10, 0.10 } bg[SELECTED] = { 0, 0.40, 0.60 } @@ -720,7 +720,7 @@ style "audio_bus_base" font_name = "%FONT_SMALLER%" fg[NORMAL] = { 0.77, 0.77, 0.72 } fg[NORMAL] = { 0.7, 0.8, 0.2 } - bg[NORMAL] = { 0.20, 0.20, 0.26 } + bg[NORMAL] = "#363c45" } style "audio_track_base" = "default_base" @@ -728,7 +728,6 @@ style "audio_track_base" = "default_base" font_name = "%FONT_SMALLER%" fg[NORMAL] = { 0.77, 0.77, 0.72 } bg[NORMAL] = "#43546e" - bg[NORMAL] = { 0.18, 0.19, 0.22 } bg[ACTIVE] = { 0.20, 0.20, 0.20 } bg[PRELIGHT] = { 0.20, 0.20, 0.20 } bg[INSENSITIVE] = { 0.20, 0.20, 0.20 } diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index bc036be991..53480f3ba5 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -139,11 +139,11 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar // add channel selector expander HBox *channel_selector_box = manage(new HBox()); - channel_selector_box->pack_start(_channel_selector, SHRINK, 0); + channel_selector_box->pack_start(_channel_selector, false, false); _midi_expander.add(*channel_selector_box); _midi_expander.property_expanded().signal_changed().connect( mem_fun(this, &MidiTimeAxisView::channel_selector_toggled)); - controls_vbox.pack_end(_midi_expander, SHRINK, 0); + controls_vbox.pack_end(_midi_expander, false, false); boost::shared_ptr<MidiDiskstream> diskstream = midi_track()->midi_diskstream(); // restore channel selector settings @@ -194,6 +194,9 @@ MidiTimeAxisView::set_height (uint32_t h) { RouteTimeAxisView::set_height (h); + static const int EXPANDER_MIN_HEIGHT = 100; + static const int KEYBOARD_MIN_HEIGHT = 250; + if (height >= hLarger) { _midi_expander.show(); if (is_track() && _range_scroomer) |