GNOME.org
 

[libadwaita/wip/exalm/tab-fixes: 4/4] tabs: Separate clipping into another widget


commit df6263a6c5ba691f08468943559f53652a6b2364
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Dec 27 16:39:00 2021 +0500

    tabs: Separate clipping into another widget
    
    When opening and closing tabs, we animate their width from/to 0. However,
    tabs have padding and border, and so doing that is not allowed.
    
    Additionally, AdwTab allocates its contents out of bounds and set
    overflow=hidden.
    
    Move all of that into gizmos that AdwTabBox would manage, and leave padding
    and borders on AdwTab. That way the widget that gets animated to 0 width
    and that allocates its child out of bounds has no border or padding and the
    errors go away.
    
    Fixes https://gitlab.gnome.org/GNOME/libadwaita/-/issues/352

 src/adw-tab-box.c                     | 123 ++++++++++++++++++++----------
 src/adw-tab-private.h                 |   4 -
 src/adw-tab.c                         | 136 ++++++++++------------------------
 src/adw-tab.ui                        |   2 -
 src/stylesheet/widgets/_tab-view.scss |  14 ++--
 5 files changed, 130 insertions(+), 149 deletions(-)
---
diff --git a/src/adw-tab-box.c b/src/adw-tab-box.c
index 18d07893..cdea94d7 100644
--- a/src/adw-tab-box.c
+++ b/src/adw-tab-box.c
@@ -18,6 +18,7 @@
 #include "adw-tab-bar-private.h"
 #include "adw-tab-view-private.h"
 #include "adw-timed-animation.h"
+#include "adw-widget-utils-private.h"
 #include <math.h>
 
 /* Border collapsing without glitches */
@@ -61,10 +62,12 @@ typedef struct {
   AdwTabBox *box;
   AdwTabPage *page;
   AdwTab *tab;
+  GtkWidget *container;
 
   int pos;
   int width;
   int last_width;
+  int display_width;
 
   double end_reorder_offset;
   double reorder_offset;
@@ -196,7 +199,7 @@ static guint signals[SIGNAL_LAST_SIGNAL];
 static void
 remove_and_free_tab_info (TabInfo *info)
 {
-  gtk_widget_unparent (GTK_WIDGET (info->tab));
+  gtk_widget_unparent (GTK_WIDGET (info->container));
 
   g_free (info);
 }
@@ -333,7 +336,7 @@ predict_tab_width (AdwTabBox *self,
   width += OVERLAP * (n + 1) - self->end_padding;
 
   /* Tabs have 0 minimum width, we need natural width instead */
-  gtk_widget_measure (GTK_WIDGET (info->tab), GTK_ORIENTATION_HORIZONTAL, -1,
+  gtk_widget_measure (GTK_WIDGET (info->container), GTK_ORIENTATION_HORIZONTAL, -1,
                       NULL, &min, NULL, NULL);
 
   if (self->expand_tabs)
@@ -352,7 +355,7 @@ calculate_tab_offset (AdwTabBox *self,
   if (!self->reordered_tab)
       return 0;
 
-  width = (target ? adw_tab_get_display_width (self->reordered_tab->tab) : self->reordered_tab->width) - 
OVERLAP;
+  width = (target ? self->reordered_tab->display_width : self->reordered_tab->width) - OVERLAP;
 
   if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
       width = -width;
@@ -446,7 +449,7 @@ set_tab_resize_mode (AdwTabBox     *self,
       TabInfo *info = l->data;
 
       if (info->appear_animation)
-        info->last_width = adw_tab_get_display_width (info->tab);
+        info->last_width = info->display_width;
       else
         info->last_width = info->width;
     }
@@ -824,7 +827,7 @@ scroll_to_tab_full (AdwTabBox *self,
   }
 
   if (info->appear_animation)
-    tab_width = adw_tab_get_display_width (info->tab);
+    tab_width = info->display_width;
 
   value = gtk_adjustment_get_value (self->adjustment);
   page_size = gtk_adjustment_get_page_size (self->adjustment);
@@ -951,7 +954,7 @@ start_reordering (AdwTabBox *self,
   self->reordered_tab = info;
 
   /* The reordered tab should be displayed above everything else */
-  gtk_widget_insert_before (GTK_WIDGET (self->reordered_tab->tab),
+  gtk_widget_insert_before (GTK_WIDGET (self->reordered_tab->container),
                             GTK_WIDGET (self), NULL);
 
   gtk_widget_queue_allocate (GTK_WIDGET (self));
@@ -1180,7 +1183,7 @@ update_drag_reodering (AdwTabBox *self)
 
   x = get_reorder_position (self);
 
-  width = adw_tab_get_display_width (self->reordered_tab->tab);
+  width = self->reordered_tab->display_width;
 
   self->reorder_window_x = x;
 
@@ -1230,13 +1233,13 @@ drag_autoscroll_cb (GtkWidget     *widget,
   int autoscroll_area = 0;
 
   if (self->reordered_tab) {
-    gtk_widget_measure (GTK_WIDGET (self->reordered_tab->tab),
+    gtk_widget_measure (self->reordered_tab->container,
                         GTK_ORIENTATION_HORIZONTAL, -1,
                         NULL, &tab_width, NULL, NULL);
     tab_width -= 2 * OVERLAP;
     x = (double) self->reorder_x + OVERLAP;
   } else if (self->drop_target_tab) {
-    gtk_widget_measure (GTK_WIDGET (self->drop_target_tab->tab),
+    gtk_widget_measure (self->drop_target_tab->container,
                         GTK_ORIENTATION_HORIZONTAL, -1,
                         NULL, &tab_width, NULL, NULL);
     tab_width -= 2 * OVERLAP;
@@ -1545,10 +1548,10 @@ select_page (AdwTabBox  *self,
   }
 
   if (adw_tab_bar_tabs_have_visible_focus (self->tab_bar))
-    gtk_widget_grab_focus (GTK_WIDGET (self->selected_tab->tab));
+    gtk_widget_grab_focus (self->selected_tab->container);
 
   gtk_widget_set_focus_child (GTK_WIDGET (self),
-                              GTK_WIDGET (self->selected_tab->tab));
+                              self->selected_tab->container);
 
   if (self->selected_tab->width >= 0)
     scroll_to_tab (self, self->selected_tab, FOCUS_ANIMATION_DURATION);
@@ -1575,8 +1578,8 @@ appear_animation_value_cb (double   value,
 {
   info->appear_progress = value;
 
-  if (GTK_IS_WIDGET (info->tab))
-    gtk_widget_queue_resize (GTK_WIDGET (info->tab));
+  if (GTK_IS_WIDGET (info->container))
+    gtk_widget_queue_resize (info->container);
 }
 
 static void
@@ -1585,6 +1588,40 @@ open_animation_done_cb (TabInfo *info)
   g_clear_object (&info->appear_animation);
 }
 
+static void
+measure_tab (AdwGizmo       *widget,
+             GtkOrientation  orientation,
+             int             for_size,
+             int            *minimum,
+             int            *natural,
+             int            *minimum_baseline,
+             int            *natural_baseline)
+{
+  GtkWidget *child = gtk_widget_get_first_child (GTK_WIDGET (widget));
+
+  gtk_widget_measure (child, orientation, for_size,
+                      minimum, natural,
+                      minimum_baseline,  natural_baseline);
+
+  if (orientation == GTK_ORIENTATION_HORIZONTAL && minimum)
+    *minimum = 0;
+}
+
+static void
+allocate_tab (AdwGizmo *widget,
+              int       width,
+              int       height,
+              int       baseline)
+{
+  TabInfo *info = g_object_get_data (G_OBJECT (widget), "info");
+  GtkWidget *child = gtk_widget_get_first_child (GTK_WIDGET (widget));
+  int allocated_width = gtk_widget_get_allocated_width (GTK_WIDGET (widget));
+  int width_diff = MAX (0, info->display_width - allocated_width);
+
+  gtk_widget_allocate (child, width + width_diff, height, baseline,
+                       gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (-width_diff / 2, 0)));
+}
+
 static TabInfo *
 create_tab_info (AdwTabBox  *self,
                  AdwTabPage *page)
@@ -1596,8 +1633,16 @@ create_tab_info (AdwTabBox  *self,
   info->page = page;
   info->pos = -1;
   info->width = -1;
+  info->container = adw_gizmo_new ("widget", measure_tab, allocate_tab,
+                                   NULL, NULL,
+                                   (AdwGizmoFocusFunc) adw_widget_focus_child,
+                                   (AdwGizmoGrabFocusFunc) adw_widget_grab_focus_self);
   info->tab = adw_tab_new (self->view, self->pinned);
 
+  g_object_set_data (G_OBJECT (info->container), "info", info);
+  gtk_widget_set_overflow (info->container, GTK_OVERFLOW_HIDDEN);
+  gtk_widget_set_focusable (info->container, TRUE);
+
   adw_tab_set_page (info->tab, page);
   adw_tab_set_inverted (info->tab, self->inverted);
   adw_tab_setup_extra_drop_target (info->tab,
@@ -1605,7 +1650,8 @@ create_tab_info (AdwTabBox  *self,
                                    self->extra_drag_types,
                                    self->extra_drag_n_types);
 
-  gtk_widget_set_parent (GTK_WIDGET (info->tab), GTK_WIDGET (self));
+  gtk_widget_set_parent (GTK_WIDGET (info->tab), info->container);
+  gtk_widget_set_parent (info->container, GTK_WIDGET (self));
 
   g_signal_connect_object (info->tab, "extra-drag-drop", G_CALLBACK (extra_drag_drop_cb), self, 0);
 
@@ -1729,7 +1775,7 @@ page_detached_cb (AdwTabBox  *self,
 
   g_assert (info->page);
 
-  if (gtk_widget_is_focus (GTK_WIDGET (info->tab)))
+  if (gtk_widget_is_focus (info->container))
     adw_tab_box_try_focus_selected_tab (self);
 
   if (info == self->selected_tab)
@@ -1912,7 +1958,7 @@ insert_placeholder (AdwTabBox  *self,
 
     info = create_tab_info (self, page);
 
-    gtk_widget_set_opacity (GTK_WIDGET (info->tab), 0);
+    gtk_widget_set_opacity (info->container, 0);
 
     adw_tab_set_dragging (info->tab, TRUE);
 
@@ -1922,7 +1968,7 @@ insert_placeholder (AdwTabBox  *self,
       double page_size = gtk_adjustment_get_page_size (self->adjustment);
 
       if (self->allocated_width > page_size) {
-        gtk_widget_measure (GTK_WIDGET (info->tab), GTK_ORIENTATION_HORIZONTAL, -1,
+        gtk_widget_measure (info->container, GTK_ORIENTATION_HORIZONTAL, -1,
                             NULL, &self->placeholder_scroll_offset, NULL, NULL);
 
         self->placeholder_scroll_offset /= 2;
@@ -1974,7 +2020,7 @@ replace_placeholder (AdwTabBox  *self,
   AdwAnimationTarget *target;
 
   self->placeholder_scroll_offset = 0;
-  gtk_widget_set_opacity (GTK_WIDGET (self->reorder_placeholder->tab), 1);
+  gtk_widget_set_opacity (self->reorder_placeholder->container, 1);
   adw_tab_set_dragging (info->tab, FALSE);
 
   if (!info->appear_animation) {
@@ -2216,7 +2262,6 @@ icon_resize_animation_value_cb (double    value,
 
   icon->width = (int) round (value);
 
-  adw_tab_set_display_width (icon->tab, icon->width);
   gtk_widget_set_size_request (GTK_WIDGET (icon->tab),
                                icon->width + icon->tab_margin.left + icon->tab_margin.right,
                                -1);
@@ -2248,7 +2293,6 @@ create_drag_icon (AdwTabBox *self,
   adw_tab_set_page (icon->tab, self->reordered_tab->page);
   adw_tab_set_dragging (icon->tab, TRUE);
   adw_tab_set_inverted (icon->tab, self->inverted);
-  adw_tab_set_display_width (icon->tab, icon->width);
   gtk_widget_set_halign (GTK_WIDGET (icon->tab), GTK_ALIGN_START);
 
   gtk_drag_icon_set_child (GTK_DRAG_ICON (gtk_drag_icon_get_for_drag (drag)),
@@ -2305,7 +2349,7 @@ begin_drag (AdwTabBox *self,
   GdkSurface *surface;
   GdkDrag *drag;
   TabInfo *detached_info;
-  AdwTab *detached_tab;
+  GtkWidget *detached_tab;
 
   native = gtk_widget_get_native (GTK_WIDGET (self));
   surface = gtk_native_get_surface (native);
@@ -2314,7 +2358,7 @@ begin_drag (AdwTabBox *self,
   self->pressed_tab = NULL;
 
   detached_info = self->reordered_tab;
-  detached_tab = g_object_ref (detached_info->tab);
+  detached_tab = g_object_ref (detached_info->container);
   self->detached_page = detached_info->page;
 
   self->indirect_reordering = TRUE;
@@ -2341,15 +2385,14 @@ begin_drag (AdwTabBox *self,
   end_drag_reodering (self);
   update_hover (self);
 
-  gtk_widget_set_opacity (GTK_WIDGET (detached_tab), 0);
+  gtk_widget_set_opacity (detached_tab, 0);
   self->detached_index = adw_tab_view_get_page_position (self->view, self->detached_page);
 
   adw_tab_view_detach_page (self->view, self->detached_page);
 
   self->indirect_reordering = FALSE;
 
-  gtk_widget_measure (GTK_WIDGET (detached_tab),
-                      GTK_ORIENTATION_HORIZONTAL, -1,
+  gtk_widget_measure (detached_tab, GTK_ORIENTATION_HORIZONTAL, -1,
                       NULL, &self->placeholder_scroll_offset, NULL, NULL);
   self->placeholder_scroll_offset /= 2;
 
@@ -2390,7 +2433,7 @@ tab_drag_enter_motion_cb (AdwTabBox     *self,
     self->indirect_reordering = TRUE;
 
     resize_drag_icon (source_tab_box, predict_tab_width (self, self->reorder_placeholder, TRUE));
-    adw_tab_set_display_width (self->reorder_placeholder->tab, source_tab_box->drag_icon->target_width);
+    self->reorder_placeholder->display_width = source_tab_box->drag_icon->target_width;
     adw_tab_set_inverted (source_tab_box->drag_icon->tab, self->inverted);
 
     self->drag_offset_x = source_tab_box->drag_icon->hotspot_x;
@@ -2609,7 +2652,7 @@ do_popup (AdwTabBox *self,
     rect.y = y;
   } else {
     rect.x = info->pos;
-    rect.y = gtk_widget_get_allocated_height (GTK_WIDGET (info->tab));
+    rect.y = gtk_widget_get_allocated_height (GTK_WIDGET (info->container));
 
     if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
       rect.x += info->width;
@@ -2688,7 +2731,7 @@ handle_click (AdwTabBox  *self,
     adw_tab_view_set_selected_page (self->view, info->page);
 
   if (can_grab_focus)
-    gtk_widget_grab_focus (GTK_WIDGET (info->tab));
+    gtk_widget_grab_focus (info->container);
   else
     activate_tab (self);
 }
@@ -2823,7 +2866,7 @@ adw_tab_box_measure (GtkWidget      *widget,
       TabInfo *info = l->data;
       int child_width;
 
-      gtk_widget_measure (GTK_WIDGET (info->tab), orientation, -1,
+      gtk_widget_measure (info->container, orientation, -1,
                           NULL, &child_width, NULL, NULL);
 
       width += calculate_tab_width (info, child_width) - OVERLAP;
@@ -2845,7 +2888,7 @@ adw_tab_box_measure (GtkWidget      *widget,
       TabInfo *info = l->data;
       int child_min, child_nat;
 
-      gtk_widget_measure (GTK_WIDGET (info->tab), orientation, -1,
+      gtk_widget_measure (info->container, orientation, -1,
                           &child_min, &child_nat, NULL, NULL);
 
       if (child_min > min)
@@ -2916,7 +2959,7 @@ adw_tab_box_size_allocate (GtkWidget *widget,
       TabInfo *info = l->data;
       int child_width;
 
-      gtk_widget_measure (GTK_WIDGET (info->tab), GTK_ORIENTATION_HORIZONTAL, -1,
+      gtk_widget_measure (info->container, GTK_ORIENTATION_HORIZONTAL, -1,
                           NULL, &child_width, NULL, NULL);
 
       info->width = calculate_tab_width (info, child_width);
@@ -2959,9 +3002,9 @@ adw_tab_box_size_allocate (GtkWidget *widget,
     TabInfo *info = l->data;
 
     if (!info->appear_animation)
-      adw_tab_set_display_width (info->tab, info->width);
+      info->display_width = info->width;
     else if (info->page && info != self->reorder_placeholder)
-      adw_tab_set_display_width (info->tab, predict_tab_width (self, info, FALSE));
+      info->display_width = predict_tab_width (self, info, FALSE);
 
     info->pos = pos + calculate_tab_offset (self, info, FALSE);
 
@@ -2973,7 +3016,7 @@ adw_tab_box_size_allocate (GtkWidget *widget,
     child_allocation.width = info->width;
     child_allocation.height = height;
 
-    gtk_widget_size_allocate (GTK_WIDGET (info->tab), &child_allocation, baseline);
+    gtk_widget_size_allocate (info->container, &child_allocation, baseline);
 
     pos += (is_rtl ? -1 : 1) * (info->width - OVERLAP);
   }
@@ -3014,7 +3057,7 @@ snapshot_tab (AdwTabBox      *self,
   int pos, width, scroll_pos;
   int i, n;
 
-  if (gtk_widget_get_opacity (GTK_WIDGET (info->tab)) <= 0)
+  if (gtk_widget_get_opacity (info->container) <= 0)
     return;
 
   rect.height = gtk_widget_get_height (GTK_WIDGET (self));
@@ -3041,13 +3084,13 @@ snapshot_tab (AdwTabBox      *self,
       continue;
 
     gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (clip_rect.x, clip_rect.y, clip_rect.width, 
clip_rect.height));
-    gtk_widget_snapshot_child (GTK_WIDGET (self), GTK_WIDGET (info->tab), snapshot);
+    gtk_widget_snapshot_child (GTK_WIDGET (self), info->container, snapshot);
     gtk_snapshot_pop (snapshot);
     clip = TRUE;
   }
 
   if (!clip)
-    gtk_widget_snapshot_child (GTK_WIDGET (self), GTK_WIDGET (info->tab), snapshot);
+    gtk_widget_snapshot_child (GTK_WIDGET (self), info->container, snapshot);
 
   rect.x = pos - scroll_pos;
   rect.width = width;
@@ -3106,7 +3149,7 @@ adw_tab_box_focus (GtkWidget        *widget,
   if (!self->selected_tab)
     return GDK_EVENT_PROPAGATE;
 
-  return gtk_widget_child_focus (GTK_WIDGET (self->selected_tab->tab), direction);
+  return gtk_widget_grab_focus (self->selected_tab->container);
 }
 
 static void
@@ -3581,7 +3624,7 @@ adw_tab_box_try_focus_selected_tab (AdwTabBox *self)
   g_return_if_fail (ADW_IS_TAB_BOX (self));
 
   if (self->selected_tab)
-    gtk_widget_grab_focus (GTK_WIDGET (self->selected_tab->tab));
+    gtk_widget_grab_focus (self->selected_tab->container);
 }
 
 gboolean
@@ -3595,7 +3638,7 @@ adw_tab_box_is_page_focused (AdwTabBox  *self,
 
   info = find_info_for_page (self, page);
 
-  return info && gtk_widget_is_focus (GTK_WIDGET (info->tab));
+  return info && gtk_widget_is_focus (info->container);
 }
 
 void
diff --git a/src/adw-tab-private.h b/src/adw-tab-private.h
index f5d0c9b3..f4c2dcd0 100644
--- a/src/adw-tab-private.h
+++ b/src/adw-tab-private.h
@@ -28,10 +28,6 @@ AdwTabPage *adw_tab_get_page (AdwTab     *self);
 void        adw_tab_set_page (AdwTab     *self,
                               AdwTabPage *page);
 
-int  adw_tab_get_display_width (AdwTab *self);
-void adw_tab_set_display_width (AdwTab *self,
-                                int     width);
-
 gboolean adw_tab_get_hovering (AdwTab   *self);
 void     adw_tab_set_hovering (AdwTab   *self,
                                gboolean  hovering);
diff --git a/src/adw-tab.c b/src/adw-tab.c
index d797fdb7..6d344cc6 100644
--- a/src/adw-tab.c
+++ b/src/adw-tab.c
@@ -37,7 +37,6 @@ struct _AdwTab
   AdwTabPage *page;
   gboolean pinned;
   gboolean dragging;
-  int display_width;
 
   gboolean hovering;
   gboolean selected;
@@ -61,7 +60,6 @@ enum {
   PROP_PINNED,
   PROP_DRAGGING,
   PROP_PAGE,
-  PROP_DISPLAY_WIDTH,
   PROP_INVERTED,
   LAST_PROP
 };
@@ -405,52 +403,58 @@ measure_child (GtkWidget *child,
 }
 
 static inline void
-allocate_child (GtkWidget     *child,
-                GtkAllocation *alloc,
-                int            x,
-                int            width,
-                int            baseline)
+allocate_child (GtkWidget *child,
+                int        parent_width,
+                int        parent_height,
+                int        x,
+                int        width,
+                int        baseline)
 {
-  GtkAllocation child_alloc = *alloc;
+  GtkAllocation child_alloc = {};
 
   if (gtk_widget_get_direction (child) == GTK_TEXT_DIR_RTL)
-    child_alloc.x += alloc->width - width - x;
+    child_alloc.x = parent_width - width - x;
   else
-    child_alloc.x += x;
+    child_alloc.x = x;
 
+  child_alloc.y = 0;
   child_alloc.width = width;
+  child_alloc.height = parent_height;
 
   gtk_widget_size_allocate (child, &child_alloc, baseline);
 }
 
 static void
-allocate_contents (AdwTab        *self,
-                   GtkAllocation *alloc,
-                   int            baseline)
+adw_tab_size_allocate (GtkWidget *widget,
+                       int        width,
+                       int        height,
+                       int        baseline)
 {
+  AdwTab *self = ADW_TAB (widget);
   int indicator_width, close_width, icon_width, title_width;
   int center_x, center_width = 0;
   int start_width = 0, end_width = 0;
 
-  measure_child (self->icon_stack, alloc->height, &icon_width);
-  measure_child (self->title, alloc->height, &title_width);
-  measure_child (self->indicator_btn, alloc->height, &indicator_width);
-  measure_child (self->close_btn, alloc->height, &close_width);
+  measure_child (self->icon_stack, height, &icon_width);
+  measure_child (self->title, height, &title_width);
+  measure_child (self->indicator_btn, height, &indicator_width);
+  measure_child (self->close_btn, height, &close_width);
 
   if (gtk_widget_get_visible (self->indicator_btn)) {
     if (self->pinned) {
       /* Center it in a pinned tab */
-      allocate_child (self->indicator_btn, alloc,
-                      (alloc->width - indicator_width) / 2, indicator_width,
+      allocate_child (self->indicator_btn, width, height,
+                      (width - indicator_width) / 2, indicator_width,
                       baseline);
     } else if (self->inverted) {
-      allocate_child (self->indicator_btn, alloc,
-                      alloc->width - indicator_width, indicator_width,
+      allocate_child (self->indicator_btn, width, height,
+                      width - indicator_width, indicator_width,
                       baseline);
 
       end_width = indicator_width;
     } else {
-      allocate_child (self->indicator_btn, alloc, 0, indicator_width, baseline);
+      allocate_child (self->indicator_btn, width, height,
+                      0, indicator_width, baseline);
 
       start_width = indicator_width;
     }
@@ -458,66 +462,42 @@ allocate_contents (AdwTab        *self,
 
   if (gtk_widget_get_visible (self->close_btn)) {
     if (self->inverted) {
-      allocate_child (self->close_btn, alloc, 0, close_width, baseline);
+      allocate_child (self->close_btn, width, height,
+                      0, close_width, baseline);
 
       start_width = close_width;
     } else {
-      allocate_child (self->close_btn, alloc,
-                      alloc->width - close_width, close_width, baseline);
+      allocate_child (self->close_btn, width, height,
+                      width - close_width, close_width, baseline);
 
       if (self->title_inverted)
         end_width = close_width;
     }
   }
 
-  center_width = MIN (alloc->width - start_width - end_width,
+  center_width = MIN (width - start_width - end_width,
                       icon_width + title_width);
-  center_x = CLAMP ((alloc->width - center_width) / 2,
+  center_x = CLAMP ((width - center_width) / 2,
                     start_width,
-                    alloc->width - center_width - end_width);
+                    width - center_width - end_width);
 
   self->close_overlap = !self->inverted &&
                         !self->title_inverted &&
                         gtk_widget_get_visible (self->title) &&
                         gtk_widget_get_visible (self->close_btn) &&
-                        center_x + center_width > alloc->width - close_width;
+                        center_x + center_width > width - close_width;
 
   if (gtk_widget_get_visible (self->icon_stack)) {
-    allocate_child (self->icon_stack, alloc, center_x, icon_width, baseline);
+    allocate_child (self->icon_stack, width, height,
+                    center_x, icon_width, baseline);
 
     center_x += icon_width;
     center_width -= icon_width;
   }
 
   if (gtk_widget_get_visible (self->title))
-    allocate_child (self->title, alloc, center_x, center_width, baseline);
-}
-
-static void
-adw_tab_size_allocate (GtkWidget *widget,
-                       int        width,
-                       int        height,
-                       int        baseline)
-{
-  AdwTab *self = ADW_TAB (widget);
-  GtkAllocation child_alloc;
-  int allocated_width, width_diff;
-
-  if (!self->icon_stack ||
-      !self->indicator_btn ||
-      !self->title ||
-      !self->close_btn)
-    return;
-
-  allocated_width = gtk_widget_get_allocated_width (widget);
-  width_diff = MAX (0, self->display_width - allocated_width);
-
-  child_alloc.x = -width_diff / 2;
-  child_alloc.y = 0;
-  child_alloc.height = height;
-  child_alloc.width = width + width_diff;
-
-  allocate_contents (self, &child_alloc, baseline);
+    allocate_child (self->title, width, height,
+                    center_x, center_width, baseline);
 }
 
 static void
@@ -661,10 +641,6 @@ adw_tab_get_property (GObject    *object,
     g_value_set_boolean (value, adw_tab_get_dragging (self));
     break;
 
-  case PROP_DISPLAY_WIDTH:
-    g_value_set_int (value, adw_tab_get_display_width (self));
-    break;
-
   case PROP_INVERTED:
     g_value_set_boolean (value, adw_tab_get_inverted (self));
     break;
@@ -699,10 +675,6 @@ adw_tab_set_property (GObject      *object,
     adw_tab_set_dragging (self, g_value_get_boolean (value));
     break;
 
-  case PROP_DISPLAY_WIDTH:
-    adw_tab_set_display_width (self, g_value_get_int (value));
-    break;
-
   case PROP_INVERTED:
     adw_tab_set_inverted (self, g_value_get_boolean (value));
     break;
@@ -776,13 +748,6 @@ adw_tab_class_init (AdwTabClass *klass)
                          ADW_TYPE_TAB_PAGE,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
-  props[PROP_DISPLAY_WIDTH] =
-    g_param_spec_int ("display-width",
-                      "Display Width",
-                      "Display Width",
-                      0, G_MAXINT, 0,
-                      G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
-
   props[PROP_INVERTED] =
     g_param_spec_boolean ("inverted",
                           "Inverted",
@@ -930,31 +895,6 @@ adw_tab_set_page (AdwTab     *self,
   g_object_notify_by_pspec (G_OBJECT (self), props[PROP_PAGE]);
 }
 
-int
-adw_tab_get_display_width (AdwTab *self)
-{
-  g_return_val_if_fail (ADW_IS_TAB (self), 0);
-
-  return self->display_width;
-}
-
-void
-adw_tab_set_display_width (AdwTab *self,
-                           int     width)
-{
-  g_return_if_fail (ADW_IS_TAB (self));
-  g_return_if_fail (width >= 0);
-
-  if (self->display_width == width)
-    return;
-
-  self->display_width = width;
-
-  gtk_widget_queue_allocate (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_DISPLAY_WIDTH]);
-}
-
 gboolean
 adw_tab_get_dragging (AdwTab *self)
 {
diff --git a/src/adw-tab.ui b/src/adw-tab.ui
index 776b5052..8898c6f3 100644
--- a/src/adw-tab.ui
+++ b/src/adw-tab.ui
@@ -2,8 +2,6 @@
 <interface domain="libadwaita">
   <requires lib="gtk" version="4.0"/>
   <template class="AdwTab" parent="GtkWidget">
-    <property name="focusable">True</property>
-    <property name="overflow">hidden</property>
     <child>
       <object class="GtkEventControllerMotion">
         <signal name="enter" handler="enter_cb" swapped="true"/>
diff --git a/src/stylesheet/widgets/_tab-view.scss b/src/stylesheet/widgets/_tab-view.scss
index 11087099..551e1d14 100644
--- a/src/stylesheet/widgets/_tab-view.scss
+++ b/src/stylesheet/widgets/_tab-view.scss
@@ -66,20 +66,24 @@ tabbar {
     @include need-attention-gradient("left");
   }
 
-  tabbox > background {
-    background-color: $shade_color;
+  tabbox {
+    > background {
+      background-color: $shade_color;
+    }
+
+    > widget {
+      @include focus-ring();
+    }
   }
 
   tab {
     border-style: solid;
     border-color: $border_color;
     border-width: 0 1px 0 1px;
-    transition: background 150ms ease-in-out, $focus_transition;
+    transition: background 150ms ease-in-out;
     background-color: gtkalpha($shade_color, .6);
     background-clip: padding-box;
 
-    @include focus-ring();
-
     &:checked {
       background-color: transparent;
     }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]