smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

tweak "joined" buttons to have no border color

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11460 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-02-06 18:38:02 +00:00
parent 5252c77d94
commit aeb4617b1d
4 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/ardour_button.cc
View file

@ -345,6 +345,7 @@ ArdourButton::set_colors ()
if (edge_pattern) { if (edge_pattern) {
cairo_pattern_destroy (edge_pattern); cairo_pattern_destroy (edge_pattern);
edge_pattern = 0;
} }
if (_elements & Edge) { if (_elements & Edge) {
@ -369,6 +370,7 @@ ArdourButton::set_colors ()
if (fill_pattern) { if (fill_pattern) {
cairo_pattern_destroy (fill_pattern); cairo_pattern_destroy (fill_pattern);
fill_pattern = 0;
} }
if (_elements & Body) { if (_elements & Body) {
@ -722,3 +724,10 @@ ArdourButton::set_rounded_corner_mask (int mask)
_corner_mask = mask; _corner_mask = mask;
queue_draw (); queue_draw ();
} }
void
ArdourButton::set_elements (Element e)
{
_elements = e;
set_colors ();
}

1
gtk2_ardour/ardour_button.h
View file

@ -60,6 +60,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void set_visual_state (Gtkmm2ext::VisualState); void set_visual_state (Gtkmm2ext::VisualState);
Element elements() const { return _elements; } Element elements() const { return _elements; }
void set_elements (Element);
void set_corner_radius (float); void set_corner_radius (float);
void set_rounded_corner_mask (int); void set_rounded_corner_mask (int);

3
gtk2_ardour/ardour_ui.cc
View file

@ -221,6 +221,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
original_big_clock_height = -1; original_big_clock_height = -1;
original_big_clock_font_size = 0; original_big_clock_font_size = 0;
roll_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
play_selection_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
roll_button.set_controllable (roll_controllable); roll_button.set_controllable (roll_controllable);
stop_button.set_controllable (stop_controllable); stop_button.set_controllable (stop_controllable);
goto_start_button.set_controllable (goto_start_controllable); goto_start_button.set_controllable (goto_start_controllable);

3
gtk2_ardour/editor.cc
View file

@ -2791,6 +2791,9 @@ Editor::setup_toolbar ()
smart_mode_joiner = manage (new ButtonJoiner ("mouse mode button", mouse_move_button, mouse_select_button)); smart_mode_joiner = manage (new ButtonJoiner ("mouse mode button", mouse_move_button, mouse_select_button));
smart_mode_joiner->set_related_action (smart_mode_action); smart_mode_joiner->set_related_action (smart_mode_action);
mouse_move_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
mouse_select_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
mouse_move_button.set_rounded_corner_mask (0x1); // upper left only mouse_move_button.set_rounded_corner_mask (0x1); // upper left only
mouse_select_button.set_rounded_corner_mask (0x2); // upper right only mouse_select_button.set_rounded_corner_mask (0x2); // upper right only