X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fclick_box.cc;h=63ab3db7ba5c88e1f803245a46f23800354bc1b1;hb=93a64cb4fc1817bc0640e76de6b826d4fbfbd8c0;hp=ca8d7f725fdf42412f31226d0ec92c56bb7bc58f;hpb=e4b9aed743fc765219ac775905a221c017c88fba;p=ardour.git

diff --git a/libs/gtkmm2ext/click_box.cc b/libs/gtkmm2ext/click_box.cc
index ca8d7f725f..63ab3db7ba 100644
--- a/libs/gtkmm2ext/click_box.cc
+++ b/libs/gtkmm2ext/click_box.cc
@@ -32,20 +32,22 @@ using namespace sigc;
 ClickBox::ClickBox (Gtk::Adjustment *adjp, const string &name, bool round_to_steps)
 	: AutoSpin (*adjp,0,round_to_steps)
 {
-	print_func = default_printer;
-	print_arg = 0;
+	layout = create_pango_layout ("");
+	twidth = 0;
+	theight = 0;
+
 
-	set_name (name);
 	add_events (Gdk::BUTTON_RELEASE_MASK|
 		    Gdk::BUTTON_PRESS_MASK|
 		    Gdk::ENTER_NOTIFY_MASK|
 		    Gdk::LEAVE_NOTIFY_MASK);
-	set_label ();
 
 	get_adjustment().signal_value_changed().connect (mem_fun (*this, &ClickBox::set_label));
-
+	signal_style_changed().connect (mem_fun (*this, &ClickBox::style_changed));
 	signal_button_press_event().connect (mem_fun (*this, &ClickBox::button_press_handler));
 	signal_button_release_event().connect (mem_fun (*this, &ClickBox::button_release_handler));
+	set_name (name);
+	set_label ();
 }
 
 ClickBox::~ClickBox ()
@@ -76,16 +78,27 @@ ClickBox::button_release_handler (GdkEventButton* ev)
 }
 
 void
-ClickBox::default_printer (char buf[32], Gtk::Adjustment &adj, 
-			       void *ignored)
+ClickBox::set_label ()
 {
-	sprintf (buf, "%.2f", adj.get_value());
+	char buf[32];
+
+	bool const h = _printer (buf, get_adjustment());
+	if (!h) {
+		/* the printer didn't handle it, so use a default */
+		sprintf (buf, "%.2f", get_adjustment().get_value ());
+	}
+
+	layout->set_text (buf);
+	layout->get_pixel_size (twidth, theight);
+
+	queue_draw ();
 }
 
 void
-ClickBox::set_label ()
+ClickBox::style_changed (const Glib::RefPtr<Gtk::Style>&)
 {
-	queue_draw ();
+	layout->context_changed (); 
+	layout->get_pixel_size (twidth, theight);
 }
 
 bool
@@ -100,25 +113,36 @@ ClickBox::on_expose_event (GdkEventExpose *ev)
 
 	Gtk::DrawingArea::on_expose_event (ev);
 
-	if (print_func) {
-
-		char buf[32];
-
-		Glib::RefPtr<Gtk::Style> style (get_style());
-
-		print_func (buf, get_adjustment(), print_arg);
-
-		Glib::RefPtr <Gdk::Window> win (get_window());
-		win->draw_rectangle (style->get_bg_gc(get_state()),
-				     TRUE, 0, 0, -1, -1);
-
-		{
-			int width = 0;
-			int height = 0;
-			create_pango_layout(buf)->get_pixel_size(width, height);
-			set_size_request(width, height);
-		}
+	Glib::RefPtr<Gtk::Style> style (get_style());
+	Glib::RefPtr<Gdk::GC> fg_gc (style->get_fg_gc (Gtk::STATE_NORMAL));
+	Glib::RefPtr<Gdk::GC> bg_gc (style->get_bg_gc (Gtk::STATE_NORMAL));
+	Glib::RefPtr<Gdk::Window> win (get_window());
+	
+	GdkRectangle base_rect;
+	GdkRectangle draw_rect;
+	gint x, y, width, height, depth;
+	
+	win->get_geometry (x, y, width, height, depth);
+	
+	base_rect.width = width;
+	base_rect.height = height;
+	base_rect.x = 0;
+	base_rect.y = 0;
+	
+	gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
+	win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
+	
+	if (twidth && theight) {
+		win->draw_layout (fg_gc, (width - twidth) / 2, (height - theight) / 2, layout);
 	}
 
 	return true;
 }
+
+void
+ClickBox::set_printer (sigc::slot<bool, char *, Gtk::Adjustment &> p)
+{
+	_printer = p;
+	set_label ();
+}
+