projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix OSX compilation
[ardour.git]
/
gtk2_ardour
/
ardour_button.h
diff --git
a/gtk2_ardour/ardour_button.h
b/gtk2_ardour/ardour_button.h
index 25986ccc0c8bb4ea7afcfb970d0dc6c4367a2fe2..78c2f5e369ae7f5bed1ab125e78bb9d978a189cb 100644
(file)
--- a/
gtk2_ardour/ardour_button.h
+++ b/
gtk2_ardour/ardour_button.h
@@
-55,7
+55,8
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
enum Tweaks {
Square = 0x1,
TrackHeader = 0x2,
enum Tweaks {
Square = 0x1,
TrackHeader = 0x2,
- unused3 = 0x4,
+ OccasionalText = 0x4,
+ unused4 = 0x8,
};
Tweaks tweaks() const { return _tweaks; }
};
Tweaks tweaks() const { return _tweaks; }
@@
-104,7
+105,9
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void set_image (const Glib::RefPtr<Gdk::Pixbuf>&);
void set_image (const Glib::RefPtr<Gdk::Pixbuf>&);
- void set_fixed_colors (const uint32_t active_color, const uint32_t inactive_color);
+ void set_fixed_colors (const uint32_t active_color, const uint32_t inactive_color);
+ void set_active_color (const uint32_t active_color);
+ void set_inactive_color (const uint32_t inactive_color);
void set_fallthrough_to_parent(bool fall) { _fallthrough_to_parent = fall; }
void set_fallthrough_to_parent(bool fall) { _fallthrough_to_parent = fall; }
@@
-172,7
+175,7
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
bool _distinct_led_click;
bool _hovering;
bool _focused;
bool _distinct_led_click;
bool _hovering;
bool _focused;
-
bool
_fixed_colors_set;
+
int
_fixed_colors_set;
bool _fallthrough_to_parent;
int _layout_ellipsize_width;
Pango::EllipsizeMode _ellipsis;
bool _fallthrough_to_parent;
int _layout_ellipsize_width;
Pango::EllipsizeMode _ellipsis;