X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fardour_button.h;h=7d837e70cd2b0a0f3e46f55451d7232c215fded0;hb=f4203cce7ec0b8be13293e0a86f69693ec1cd977;hp=393df43b365aeac069af3cad0a1da0712fab2094;hpb=3814c65680322519f385e78ce0b7f1eef21ecf3b;p=ardour.git

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 393df43b36..7d837e70cd 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -31,7 +31,7 @@
 
 class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 {
-  public:
+	public:
 	enum Element {
 		Edge = 0x1,
 		Body = 0x2,
@@ -42,6 +42,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 		Inactive = 0x40, // no _action is defined AND state is not used
 		RecButton = 0x80, // tentative, see commit message
 		RecTapeMode = 0x100, // tentative
+		CloseCross = 0x200, // tentative
 	};
 
 	static Element default_elements;
@@ -53,8 +54,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	virtual ~ArdourButton ();
 
 	enum Tweaks {
-		unused1 = 0x1,
-		unused2 = 0x2,
+		Square = 0x1,
+		TrackHeader = 0x2,
 		unused3 = 0x4,
 	};
 
@@ -69,13 +70,11 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	Element elements() const { return _elements; }
 	void set_elements (Element);
 	void add_elements (Element);
-	
+
 	void set_corner_radius (float);
-	void set_diameter (float);
 
 	void set_text (const std::string&);
 	const std::string& get_text () {return _text;}
-	void set_markup (const std::string&);
 	void set_angle (const double);
 	void set_alignment (const float, const float);
 	void get_alignment (float& xa, float& ya) {xa = _xalign; ya = _yalign;};
@@ -83,13 +82,15 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	void set_led_left (bool yn);
 	void set_distinct_led_click (bool yn);
 
-	Glib::RefPtr<Pango::Layout> layout() const { return _layout; }
-
+	void set_layout_ellisize_width (int w);
+	void set_layout_font (const Pango::FontDescription&);
+	void set_text_ellipsize (Pango::EllipsizeMode);
+	
 	sigc::signal<void> signal_led_clicked;
 	sigc::signal<void> signal_clicked;
 
 	boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
- 	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
+	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
 	void watch ();
 
 	void set_related_action (Glib::RefPtr<Gtk::Action>);
@@ -105,13 +106,15 @@ 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; }
+	float char_avg_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_avg_pixel_width; }
 
-  protected:
+	protected:
 	void render (cairo_t *, 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>&);
 	void on_name_changed ();
+	void on_realize ();
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
 	bool on_focus_in_event (GdkEventFocus*);
@@ -121,7 +124,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	void controllable_changed ();
 	PBD::ScopedConnection watch_connection;
 
-  protected:
+	protected:
 	Glib::RefPtr<Pango::Layout> _layout;
 	Glib::RefPtr<Gdk::Pixbuf>   _pixbuf;
 	std::string                 _text;
@@ -132,6 +135,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	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;
@@ -150,31 +154,31 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
 	uint32_t led_active_color;
 	uint32_t led_inactive_color;
-    
+
 	cairo_pattern_t* convex_pattern;
 	cairo_pattern_t* concave_pattern;
-
 	cairo_pattern_t* led_inset_pattern;
-    
 	cairo_rectangle_t* _led_rect;
 
 	bool _act_on_release;
 	bool _led_left;
-	bool _fixed_diameter;
 	bool _distinct_led_click;
 	bool _hovering;
 	bool _focused;
 	bool _fixed_colors_set;
-    
 	bool _fallthrough_to_parent;
-    
+	int _layout_ellipsize_width;
+	Pango::EllipsizeMode _ellipsis;
+	bool _update_colors;
+	int _pattern_height;
+
 	void setup_led_rect ();
 	void set_colors ();
 	void color_handler ();
-        void build_patterns ();
+	void build_patterns ();
+	void ensure_layout ();
 
 	void action_toggled ();
-
 	void action_sensitivity_changed ();
 	void action_visibility_changed ();
 	void action_tooltip_changed ();