projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tempo ramps - code layout, check_solved() is lock-style agnostic, remove uncalled...
[ardour.git]
/
gtk2_ardour
/
ardour_button.h
diff --git
a/gtk2_ardour/ardour_button.h
b/gtk2_ardour/ardour_button.h
index 107f5da6181220e40f4ba969942514440bfd80d5..25986ccc0c8bb4ea7afcfb970d0dc6c4367a2fe2 100644
(file)
--- a/
gtk2_ardour/ardour_button.h
+++ b/
gtk2_ardour/ardour_button.h
@@
-25,6
+25,7
@@
#include <gtkmm/action.h>
#include "pbd/signals.h"
#include <gtkmm/action.h>
#include "pbd/signals.h"
+#include "gtkmm2ext/ardour_icon.h"
#include "gtkmm2ext/binding_proxy.h"
#include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/cairo_widget.h"
#include "gtkmm2ext/binding_proxy.h"
#include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/cairo_widget.h"
@@
-40,9
+41,7
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
unused = 0x10,
Menu = 0x20,
Inactive = 0x40, // no _action is defined AND state is not used
unused = 0x10,
Menu = 0x20,
Inactive = 0x40, // no _action is defined AND state is not used
- RecButton = 0x80, // tentative, see commit message
- RecTapeMode = 0x100, // tentative
- CloseCross = 0x200, // tentative
+ VectorIcon = 0x80, // tentative, see commit message
};
static Element default_elements;
};
static Element default_elements;
@@
-55,7
+54,7
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
enum Tweaks {
Square = 0x1,
enum Tweaks {
Square = 0x1,
-
unused2
= 0x2,
+
TrackHeader
= 0x2,
unused3 = 0x4,
};
unused3 = 0x4,
};
@@
-65,14
+64,18
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void set_active_state (Gtkmm2ext::ActiveState);
void set_visual_state (Gtkmm2ext::VisualState);
void set_active_state (Gtkmm2ext::ActiveState);
void set_visual_state (Gtkmm2ext::VisualState);
+ void set_custom_led_color (const uint32_t c, const bool useit = true);
+
void set_act_on_release (bool onRelease) { _act_on_release = onRelease; }
Element elements() const { return _elements; }
void set_elements (Element);
void add_elements (Element);
void set_act_on_release (bool onRelease) { _act_on_release = onRelease; }
Element elements() const { return _elements; }
void set_elements (Element);
void add_elements (Element);
+ Gtkmm2ext::ArdourIcon::Icon icon() const { return _icon; }
+ void set_icon (Gtkmm2ext::ArdourIcon::Icon);
+
void set_corner_radius (float);
void set_corner_radius (float);
- void set_diameter (float);
void set_text (const std::string&);
const std::string& get_text () {return _text;}
void set_text (const std::string&);
const std::string& get_text () {return _text;}
@@
-83,10
+86,11
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void set_led_left (bool yn);
void set_distinct_led_click (bool yn);
void set_led_left (bool yn);
void set_distinct_led_click (bool yn);
- void set_layout_ellisize_width (int w);
+ void set_layout_ellipsize_width (int w);
+ void set_layout_font (const Pango::FontDescription&);
void set_text_ellipsize (Pango::EllipsizeMode);
void set_text_ellipsize (Pango::EllipsizeMode);
- sigc::signal<void> signal_led_clicked;
+ sigc::signal<void
, GdkEventButton*
> signal_led_clicked;
sigc::signal<void> signal_clicked;
boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
sigc::signal<void> signal_clicked;
boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
@@
-106,6
+110,7
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
unsigned int char_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_pixel_width; }
unsigned int char_pixel_height() { if (_char_pixel_height < 1) recalc_char_pixel_geometry() ; return _char_pixel_height; }
unsigned int char_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_pixel_width; }
unsigned int char_pixel_height() { if (_char_pixel_height < 1) recalc_char_pixel_geometry() ; return _char_pixel_height; }
+ float char_avg_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_avg_pixel_width; }
protected:
void render (cairo_t *, cairo_rectangle_t *);
protected:
void render (cairo_t *, cairo_rectangle_t *);
@@
-128,12
+133,14
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
Glib::RefPtr<Gdk::Pixbuf> _pixbuf;
std::string _text;
Element _elements;
Glib::RefPtr<Gdk::Pixbuf> _pixbuf;
std::string _text;
Element _elements;
+ Gtkmm2ext::ArdourIcon::Icon _icon;
Tweaks _tweaks;
BindingProxy binding_proxy;
void recalc_char_pixel_geometry ();
unsigned int _char_pixel_width;
unsigned int _char_pixel_height;
Tweaks _tweaks;
BindingProxy binding_proxy;
void recalc_char_pixel_geometry ();
unsigned int _char_pixel_width;
unsigned int _char_pixel_height;
+ float _char_avg_pixel_width;
int _text_width;
int _text_height;
int _text_width;
int _text_height;
@@
-152,6
+159,8
@@
class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
uint32_t led_active_color;
uint32_t led_inactive_color;
uint32_t led_active_color;
uint32_t led_inactive_color;
+ uint32_t led_custom_color;
+ bool use_custom_led_color;
cairo_pattern_t* convex_pattern;
cairo_pattern_t* concave_pattern;
cairo_pattern_t* convex_pattern;
cairo_pattern_t* concave_pattern;