fix(LWW): follow extents_to_pixels for allocation

Previously, the rectangle would go through PANGO_PIXELS to get the new allocation which doesn't match extents_to_pixels' behavior. extents_to_pixels uses PANGO_PIXELS_FLOOR for them. Additionally, extents_to_pixels doesn't seem to pass the rectangle as a reference while also manipulating its width and height which we don't use. So instead use the manipulation we need only
GeopJr · Dec 26, 2023 · e2583b7 · e2583b7
1 parent 8a4708d
commit e2583b7
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Widgets/LabelWithWidgets.vala b/src/Widgets/LabelWithWidgets.vala
@@ -164,13 +164,20 @@ public class Tuba.Widgets.LabelWithWidgets : Gtk.Widget, Gtk.Buildable, Gtk.Acce
                         Pango.Rectangle logical_rect;
                         run_iter.get_run_extents (null, out logical_rect);
 
+                        int orig_x = logical_rect.x;
+                        int orig_y = logical_rect.y;
+                        logical_rect.x = pango_pixels (logical_rect.x);
+                        logical_rect.y = pango_pixels (logical_rect.y);
+                        logical_rect.width = pango_pixels (orig_x + logical_rect.width, 1024) - logical_rect.x;
+                        logical_rect.height = pango_pixels (orig_y + logical_rect.height, 1024) - logical_rect.y;
+
                         int offset_x;
                         int offset_y;
                         label.get_layout_offsets (out offset_x, out offset_y);
 
                         var allocation = Gtk.Allocation () {
-                            x = pango_pixels (logical_rect.x) + offset_x,
-                            y = pango_pixels (logical_rect.y) + offset_y,
+                            x = logical_rect.x + offset_x,
+                            y = logical_rect.y + offset_y,
                             height = widgets[i].height,
                             width = widgets[i].width
                         };
@@ -271,8 +278,8 @@ public class Tuba.Widgets.LabelWithWidgets : Gtk.Widget, Gtk.Buildable, Gtk.Acce
         this.queue_resize ();
     }
 
-    private int pango_pixels (int d) {
-        return (d + 512) >> 10;
+    private int pango_pixels (int d, int a = 0) {
+        return (d + a) >> 10;
     }
 
     public void add_child (Gtk.Builder builder, GLib.Object child, string? type) {