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 57661a05afb1cc28d0e8886d45a0c2528d281101..adcaaaaeb5ac1ac946bf969868c412a8b59f90ad 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -57,6 +57,26 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *
        w.set_size_request(width + hpadding, height + vpadding);
 }
 
+void
+Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, 
+                               const std::vector<std::string>& strings,
+                                          gint hpadding, gint vpadding)
+       
+{
+       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
 Gtkmm2ext::init ()
 {