diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 14:29:07 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 14:29:07 -0500 |
| commit | 10c8b482357dcb23476b8f4b272e933917400268 (patch) | |
| tree | ca7ea25a6ea3f0a90f6c885e08d1cd318a6e3852 | |
| parent | 6085d8c15cb3c5a746fe563323fb2df85eb2f752 (diff) | |
tweak design of time axis view item name text handling
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 10 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/utils.h | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/utils.cc | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 2617c26171..0b5acec217 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -80,10 +80,14 @@ TimeAxisViewItem::set_constant_heights () int height = 0; layout->set_font_description (NAME_FONT); - Gtkmm2ext::get_ink_pixel_size (layout, width, height); + get_pixel_size (layout, width, height); + + layout = foo.create_pango_layout (X_("H")); /* just the ascender */ + + std::cerr << " height: " << height << " baseline = " << layout->get_baseline() / PANGO_SCALE << std::endl; NAME_HEIGHT = height; - NAME_Y_OFFSET = height * 1.5; // XXX this offset is magic + NAME_Y_OFFSET = height + 2; NAME_HIGHLIGHT_SIZE = height + 2; NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; } @@ -565,7 +569,7 @@ TimeAxisViewItem::set_height (double height) manage_name_highlight (); if (visibility & ShowNameText) { - name_text->set_y_position (height + 1 - NAME_Y_OFFSET); + name_text->set_y_position (height - NAME_Y_OFFSET); } if (frame) { diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index c672afd75c..112ca42e77 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -56,6 +56,10 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, int& width, int& height); + + LIBGTKMM2EXT_API void get_pixel_size (Glib::RefPtr<Pango::Layout>, + int& width, int& height); + LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text, gint hpadding, diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index a11b431ef0..77ed843896 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -57,9 +57,9 @@ Gtkmm2ext::get_ink_pixel_size (Glib::RefPtr<Pango::Layout> layout, } void -get_pixel_size (Glib::RefPtr<Pango::Layout> layout, - int& width, - int& height) +Gtkmm2ext::get_pixel_size (Glib::RefPtr<Pango::Layout> layout, + int& width, + int& height) { layout->get_pixel_size (width, height); } |