From b9c53ea3950d0cfead30df5ad778923620b5eb8b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 9 Jul 2014 16:47:42 -0400 Subject: [PATCH] add std::string variant of set_size_request_to_display_given_string() --- libs/gtkmm2ext/gtkmm2ext/utils.h | 5 +++++ libs/gtkmm2ext/utils.cc | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 1e36868814..bad9ca75d6 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -65,11 +65,16 @@ namespace Gtkmm2ext { gint hpadding, gint vpadding); + LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w, + std::string const & text, + gint hpadding, + gint vpadding); LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w, const std::vector&, gint hpadding, gint vpadding); + LIBGTKMM2EXT_API Glib::RefPtr pixbuf_from_string (const std::string& name, const Pango::FontDescription& font, int clip_width, diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index d3a593a68f..37ed4ba66b 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -76,6 +76,17 @@ 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, std::string const & text, + gint hpadding, gint vpadding) +{ + int width, height; + w.ensure_style (); + + get_pixel_size (w.create_pango_layout (text), width, height); + w.set_size_request(width + hpadding, height + vpadding); +} + void Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const std::vector& strings,