From 045f488916e6b2d0874ac2a0601a92e13e921281 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Fri, 26 May 2023 17:00:50 +0200 Subject: [PATCH] Added patch --- gui-libs/gtk/files/4447.patch | 212 ++++++++++++++++++ ...gtk-4.11.2.ebuild => gtk-4.11.2-r1.ebuild} | 4 + 2 files changed, 216 insertions(+) create mode 100644 gui-libs/gtk/files/4447.patch rename gui-libs/gtk/{gtk-4.11.2.ebuild => gtk-4.11.2-r1.ebuild} (99%) diff --git a/gui-libs/gtk/files/4447.patch b/gui-libs/gtk/files/4447.patch new file mode 100644 index 0000000..4d79cb0 --- /dev/null +++ b/gui-libs/gtk/files/4447.patch @@ -0,0 +1,212 @@ +From 8cee572ac34d29d852dfabbf4f42c4843fb5b892 Mon Sep 17 00:00:00 2001 +From: Marco Melorio +Date: Fri, 10 Jun 2022 14:39:24 +0200 +Subject: [PATCH] listbase: Add "reversed" property + +--- + gtk/gtklistbase.c | 93 ++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 80 insertions(+), 13 deletions(-) + +diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c +index 85827363ced..b23e5a58078 100644 +--- a/gtk/gtklistbase.c ++++ b/gtk/gtklistbase.c +@@ -64,6 +64,7 @@ struct _GtkListBasePrivate + GtkListItemManager *item_manager; + GtkSelectionModel *model; + GtkOrientation orientation; ++ gboolean reversed; + GtkAdjustment *adjustment[2]; + GtkScrollablePolicy scroll_policy[2]; + +@@ -94,6 +95,7 @@ enum + PROP_HADJUSTMENT, + PROP_HSCROLL_POLICY, + PROP_ORIENTATION, ++ PROP_REVERSED, + PROP_VADJUSTMENT, + PROP_VSCROLL_POLICY, + +@@ -145,10 +147,23 @@ static gboolean + gtk_list_base_adjustment_is_flipped (GtkListBase *self, + GtkOrientation orientation) + { +- if (orientation == GTK_ORIENTATION_VERTICAL) +- return FALSE; ++ GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self); ++ gboolean rtl = gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL; + +- return gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL; ++ if (priv->orientation == GTK_ORIENTATION_VERTICAL) ++ { ++ if (orientation == GTK_ORIENTATION_VERTICAL) ++ return priv->reversed; ++ else ++ return rtl; ++ } ++ else ++ { ++ if (orientation == GTK_ORIENTATION_HORIZONTAL) ++ return rtl ^ priv->reversed; ++ else ++ return false; ++ } + } + + static void +@@ -317,8 +332,7 @@ gtk_list_base_move_focus (GtkListBase *self, + { + GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self); + +- if (orientation == GTK_ORIENTATION_HORIZONTAL && +- gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL) ++ if (gtk_list_base_adjustment_is_flipped (self, orientation)) + steps = -steps; + + if (orientation == priv->orientation) +@@ -620,6 +634,10 @@ gtk_list_base_get_property (GObject *object, + g_value_set_enum (value, priv->scroll_policy[GTK_ORIENTATION_HORIZONTAL]); + break; + ++ case PROP_REVERSED: ++ g_value_set_boolean (value, priv->reversed); ++ break; ++ + case PROP_ORIENTATION: + g_value_set_enum (value, priv->orientation); + break; +@@ -683,6 +701,22 @@ gtk_list_base_set_scroll_policy (GtkListBase *self, + : properties[PROP_VSCROLL_POLICY]); + } + ++static void ++gtk_list_base_set_reversed (GtkListBase *self, ++ gboolean reversed) ++{ ++ GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self); ++ ++ if (priv->reversed == reversed) ++ return; ++ ++ priv->reversed = reversed; ++ ++ gtk_widget_queue_resize (GTK_WIDGET (self)); ++ ++ g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_REVERSED]); ++} ++ + static void + gtk_list_base_set_property (GObject *object, + guint property_id, +@@ -702,6 +736,10 @@ gtk_list_base_set_property (GObject *object, + gtk_list_base_set_scroll_policy (self, GTK_ORIENTATION_HORIZONTAL, g_value_get_enum (value)); + break; + ++ case PROP_REVERSED: ++ gtk_list_base_set_reversed (self, g_value_get_boolean (value)); ++ break; ++ + case PROP_ORIENTATION: + { + GtkOrientation orientation = g_value_get_enum (value); +@@ -1141,6 +1179,18 @@ gtk_list_base_class_init (GtkListBaseClass *klass) + g_param_spec_override ("vscroll-policy", + g_object_interface_find_property (iface, "vscroll-policy")); + ++ /** ++ * GtkListBase:reversed: ++ * ++ * Whether to show the list in reverse or not. ++ * ++ * Since: 4.8 ++ */ ++ properties[PROP_REVERSED] = ++ g_param_spec_boolean ("reversed", NULL, NULL, ++ FALSE, ++ G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY); ++ + /** + * GtkListBase:orientation: + * +@@ -1318,7 +1368,7 @@ update_autoscroll (GtkListBase *self, + else + delta_x = 0; + +- if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL) ++ if (gtk_list_base_adjustment_is_flipped (self, GTK_ORIENTATION_HORIZONTAL)) + delta_x = - delta_x; + + height = gtk_widget_get_height (GTK_WIDGET (self)); +@@ -1330,6 +1380,9 @@ update_autoscroll (GtkListBase *self, + else + delta_y = 0; + ++ if (gtk_list_base_adjustment_is_flipped (self, GTK_ORIENTATION_VERTICAL)) ++ delta_y = - delta_y; ++ + if (delta_x != 0 || delta_y != 0) + add_autoscroll (self, delta_x, delta_y); + else +@@ -1365,14 +1418,20 @@ gtk_list_base_size_allocate_child (GtkListBase *self, + + if (gtk_list_base_get_orientation (GTK_LIST_BASE (self)) == GTK_ORIENTATION_VERTICAL) + { +- if (_gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_LTR) ++ if (gtk_list_base_adjustment_is_flipped(self, GTK_ORIENTATION_HORIZONTAL)) ++ { ++ child_allocation.x = self_width - x - width; ++ } ++ else + { + child_allocation.x = x; +- child_allocation.y = y; ++ } ++ if (gtk_list_base_adjustment_is_flipped(self, GTK_ORIENTATION_VERTICAL)) ++ { ++ child_allocation.y = self_height - y - height; + } + else + { +- child_allocation.x = self_width - x - width; + child_allocation.y = y; + } + child_allocation.width = width; +@@ -1380,14 +1439,20 @@ gtk_list_base_size_allocate_child (GtkListBase *self, + } + else + { +- if (_gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_LTR) ++ if (gtk_list_base_adjustment_is_flipped(self, GTK_ORIENTATION_HORIZONTAL)) ++ { ++ child_allocation.x = self_width - y - height; ++ } ++ else + { + child_allocation.x = y; +- child_allocation.y = x; ++ } ++ if (gtk_list_base_adjustment_is_flipped(self, GTK_ORIENTATION_VERTICAL)) ++ { ++ child_allocation.y = self_height - x - width; + } + else + { +- child_allocation.x = self_width - y - height; + child_allocation.y = x; + } + child_allocation.width = height; +@@ -1423,8 +1488,10 @@ gtk_list_base_widget_to_list (GtkListBase *self, + GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self); + GtkWidget *widget = GTK_WIDGET (self); + +- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ++ if (gtk_list_base_adjustment_is_flipped (self, GTK_ORIENTATION_HORIZONTAL)) + x_widget = gtk_widget_get_width (widget) - x_widget; ++ if (gtk_list_base_adjustment_is_flipped (self, GTK_ORIENTATION_VERTICAL)) ++ y_widget = gtk_widget_get_height (widget) - y_widget; + + gtk_list_base_get_adjustment_values (self, OPPOSITE_ORIENTATION (priv->orientation), across_out, NULL, NULL); + gtk_list_base_get_adjustment_values (self, priv->orientation, along_out, NULL, NULL); +-- +GitLab + diff --git a/gui-libs/gtk/gtk-4.11.2.ebuild b/gui-libs/gtk/gtk-4.11.2-r1.ebuild similarity index 99% rename from gui-libs/gtk/gtk-4.11.2.ebuild rename to gui-libs/gtk/gtk-4.11.2-r1.ebuild index 29cf884..47625a5 100644 --- a/gui-libs/gtk/gtk-4.11.2.ebuild +++ b/gui-libs/gtk/gtk-4.11.2-r1.ebuild @@ -96,6 +96,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/4447.patch +) + python_check_deps() { python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return }