X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_button.h;h=edccfd209fd659aa0a35d9cb03b5c8e192823b34;hb=dc0139d4af4d246f6dcafb04425e3f1198c347c3;hp=1128dce97a61500c9584932705a3a645783a4b61;hpb=523306036e0aa57e6e72eacff3a6ee33952af583;p=ardour.git

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 1128dce97a..edccfd209f 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -41,9 +41,12 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 		unused = 0x10,
 		Menu = 0x20,
 		Inactive = 0x40, // no _action is defined AND state is not used
-		VectorIcon = 0x80, // tentative, see commit message
+		VectorIcon = 0x80,
+		IconRenderCallback = 0x100,
 	};
 
+	typedef void (* rendercallback_t) (cairo_t*, int, int, uint32_t, void*);
+
 	static Element default_elements;
 	static Element led_default_elements;
 	static Element just_led_default_elements;
@@ -75,11 +78,13 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
 	Gtkmm2ext::ArdourIcon::Icon icon() const { return _icon; }
 	void set_icon (Gtkmm2ext::ArdourIcon::Icon);
+	void set_icon (rendercallback_t, void*);
 
 	void set_corner_radius (float);
 
-	void set_text (const std::string&);
-	const std::string& get_text () {return _text;}
+	void set_text (const std::string&, bool markup = false);
+	const std::string& get_text () { return _text; }
+	bool get_markup () const { return _markup; }
 	void set_angle (const double);
 	void set_alignment (const float, const float);
 	void get_alignment (float& xa, float& ya) {xa = _xalign; ya = _yalign;};
@@ -91,6 +96,12 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	void set_layout_font (const Pango::FontDescription&);
 	void set_text_ellipsize (Pango::EllipsizeMode);
 
+    /* Sets the text used for size request computation. Pass an
+     * empty string to return to the default behavior which uses
+     * the currently displayed text for measurement. */
+	void set_sizing_text (const std::string&);
+	const std::string& get_sizing_text () {return _sizing_text;}
+
 	sigc::signal<void, GdkEventButton*> signal_led_clicked;
 	sigc::signal<void> signal_clicked;
 
@@ -116,7 +127,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	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 *);
+	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	void on_size_request (Gtk::Requisition* req);
 	void on_size_allocate (Gtk::Allocation&);
 	void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
@@ -128,6 +139,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	bool on_focus_in_event (GdkEventFocus*);
 	bool on_focus_out_event (GdkEventFocus*);
 	bool on_key_release_event (GdkEventKey *);
+	bool on_key_press_event (GdkEventKey *);
 
 	void controllable_changed ();
 	PBD::ScopedConnection watch_connection;
@@ -136,11 +148,16 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	Glib::RefPtr<Pango::Layout> _layout;
 	Glib::RefPtr<Gdk::Pixbuf>   _pixbuf;
 	std::string                 _text;
+	std::string                 _sizing_text;
+	bool                        _markup;
 	Element                     _elements;
 	Gtkmm2ext::ArdourIcon::Icon _icon;
+	rendercallback_t            _icon_render_cb;
+	void*                       _icon_render_cb_data;
 	Tweaks                      _tweaks;
 	BindingProxy                binding_proxy;
 
+	void set_text_internal ();
 	void recalc_char_pixel_geometry ();
 	unsigned int _char_pixel_width;
 	unsigned int _char_pixel_height;