From fabbefe7b1938b975e9ca12ec50e526b4671e513 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 22 Jan 2025 22:59:06 +0100 Subject: [PATCH] Fix marker text vertical alignment --- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/marker.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e96dc01547..fd569b96ea 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -760,7 +760,7 @@ Editor::setup_ruler_new (Gtk::HBox& box, Gtk::Label* rlbl) { rlbl->set_name ("EditorRulerLabel"); rlbl->set_size_request (-1, (int)timebar_height); - rlbl->set_alignment (1.0, 0); + rlbl->set_alignment (1.0, 0.5); rlbl->show (); Gtk::Table* rtbl = manage (new Gtk::Table); diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index e30d026a09..46f5204399 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -375,10 +375,11 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, std::s _name_item->set_font_description (name_font); _name_item->set_color (RGBA_TO_UINT (0,0,0,255)); - if (_type==Section) { - _name_item->set_position (ArdourCanvas::Duple (_label_offset, floor (.5 * (name_height - name_height)))); + if (_type == Section) { + _name_item->set_position (ArdourCanvas::Duple (_label_offset, 1 + floor (.5 * (marker_height - name_descent)))); } else { - _name_item->set_position (ArdourCanvas::Duple (_label_offset, floor (.5 * (name_height - name_descent - .5)))); + const double padding = std::max (2., rint (2. * scale)); + _name_item->set_position (ArdourCanvas::Duple (_label_offset, 1 + floor (.5 * (marker_height - name_descent)) - padding)); } apply_color ();