combobox width fixes from mtaht, backported from 2.X

[ardour.git] / libs / gtkmm2ext / utils.cc

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 54b6c7d98735206ded80358181bb95a93a1d1464..adcaaaaeb5ac1ac946bf969868c412a8b59f90ad 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -18,24 +18,63 @@
     $Id$
 */
 
+#include <map>
+
+#include <gtk/gtkpaned.h>
+#include <gtk/gtk.h>
+
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/gtkutils.h>
+#include <gtkmm/widget.h>
+#include <gtkmm/button.h>
+#include <gtkmm/window.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "i18n.h"
 
+using namespace std;
+
 void
-Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text,
-                                           gint hpadding, gint vpadding)
+Gtkmm2ext::get_ink_pixel_size (Glib::RefPtr<Pango::Layout> layout,
+                              int& width,
+                              int& height)
+{
+       Pango::Rectangle ink_rect = layout->get_ink_extents ();
+       
+       width = (ink_rect.get_width() + PANGO_SCALE / 2) / PANGO_SCALE;
+       height = (ink_rect.get_height() + PANGO_SCALE / 2) / PANGO_SCALE;
+}
 
+void
+Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text,
+                                                  gint hpadding, gint vpadding)
+       
 {
+       int width, height;
        w.ensure_style ();
-       set_size_request_to_display_given_text(w, text, hpadding, vpadding);
+       
+       get_ink_pixel_size (w.create_pango_layout (text), width, height);
+       w.set_size_request(width + hpadding, height + vpadding);
 }
 
-gint
-do_not_propagate (GdkEventButton *ev)
+void
+Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, 
+                               const std::vector<std::string>& strings,
+                                          gint hpadding, gint vpadding)
+       
 {
-       return TRUE;
+       int width, height;
+       int width_max = 0;
+       int height_max = 0;
+       w.ensure_style ();
+       
+       for (vector<string>::const_iterator i = strings.begin(); 
+               i != strings.end(); ++i) {
+       get_ink_pixel_size (w.create_pango_layout (*i), width, height);
+       width_max = max(width_max,width);
+       height_max = max(height_max, height);
+       }
+       w.set_size_request(width_max + hpadding, height_max + vpadding);
 }
 
 void
@@ -45,3 +84,30 @@ Gtkmm2ext::init ()
        (void) bindtextdomain(PACKAGE, LOCALEDIR);
 }
 
+void
+Gtkmm2ext::set_popdown_strings (Gtk::ComboBoxText& cr, const vector<string>& strings)
+{
+       cr.clear ();
+
+       for (vector<string>::const_iterator i = strings.begin(); i != strings.end(); ++i) {
+               cr.append_text (*i);
+       }
+}
+
+GdkWindow*
+Gtkmm2ext::get_paned_handle (Gtk::Paned& paned)
+{
+       return GTK_PANED(paned.gobj())->handle;
+}
+
+void
+Gtkmm2ext::set_decoration (Gtk::Window* win, Gdk::WMDecoration decor)
+{
+       win->get_window()->set_decorations (decor);
+}
+
+void Gtkmm2ext::set_treeview_header_as_default_label(Gtk::TreeViewColumn* c)
+{
+       gtk_tree_view_column_set_widget( c->gobj(), GTK_WIDGET(0) );
+}
+