Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk4 rebuild

Browse Source
This commit is contained in:
Rmys
2023-05-30 15:34:13 +03:00
committed by GitHub
parent b2a75c8cb9
commit 8a0e1442c1
4 changed files with 188 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/gtk/gtk4/files/4f476837.diff
+77
View File
@@ -0,0 +1,77 @@
diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
index dd3b3009ccc6003d5899cb0d64b0d902a8cf1ca2..1e55323c0a4e548bcde5389e72928eee1438c0c9 100644
--- a/gtk/gtktreelistmodel.c
+++ b/gtk/gtktreelistmodel.c
@@ -357,7 +357,7 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
}
tree_added = added;
- for (i = 0; i < added; i++)
+ for (i = added; i-- > 0;)
{
child = gtk_rb_tree_insert_before (node->children, child);
child->parent = node;
diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c
index 941ac3d306b91fdd2df298ccebbfdb16d4ebe605..98493a3ba5638561ff4668ce022f2cbbadb38e25 100644
--- a/testsuite/gtk/treelistmodel.c
+++ b/testsuite/gtk/treelistmodel.c
@@ -261,6 +261,51 @@ test_remove_some (void)
g_object_unref (tree);
}
+static void
+splice (GListStore *store,
+ guint pos,
+ guint removed,
+ guint *numbers,
+ guint added)
+{
+ GObject **objects = g_newa (GObject *, added);
+ guint i;
+
+ for (i = 0; i < added; i++)
+ {
+ /* 0 cannot be differentiated from NULL, so don't use it */
+ g_assert_cmpint (numbers[i], !=, 0);
+ objects[i] = g_object_new (G_TYPE_OBJECT, NULL);
+ g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i]));
+ }
+
+ g_list_store_splice (store, pos, removed, (gpointer *) objects, added);
+
+ for (i = 0; i < added; i++)
+ g_object_unref (objects[i]);
+}
+
+static void
+test_splice (void)
+{
+ GtkTreeListModel *tree = new_model (100, TRUE);
+ gpointer item;
+
+ assert_model (tree, "100 100 100 99 98 97 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
+ assert_changes (tree, "");
+
+ item = g_list_model_get_item (G_LIST_MODEL (tree), 1);
+ g_assert_true (G_IS_LIST_MODEL (item));
+ splice (item, 0, 5, (guint[5]) { 300, 301, 302, 303, 304 }, 5);
+ /* expected */
+ assert_model (tree, "100 100 300 301 302 303 304 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
+ /* real outcome */
+ // assert_model (tree, "100 100 304 303 302 301 300 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1");
+ assert_changes (tree, "2-5+5");
+
+ g_object_unref (tree);
+}
+
/* Test for https://gitlab.gnome.org/GNOME/gtk/-/issues/4595 */
typedef struct _DemoNode DemoNode;
@@ -391,6 +436,7 @@ main (int argc, char *argv[])
g_test_add_func ("/treelistmodel/expand", test_expand);
g_test_add_func ("/treelistmodel/remove_some", test_remove_some);
+ g_test_add_func ("/treelistmodel/remove_splice", test_splice);
g_test_add_func ("/treelistmodel/collapse-change", test_collapse_change);
return g_test_run ();
desktop/toolkit/gtk/gtk4/files/541de345.diff
+86
View File
@@ -0,0 +1,86 @@
diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
index 1e55323c0a4e548bcde5389e72928eee1438c0c9..a4f0fa1d4b9ffe870e0bc9e7420945da946bc253 100644
--- a/gtk/gtktreelistmodel.c
+++ b/gtk/gtktreelistmodel.c
@@ -101,8 +101,15 @@ static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
static GtkTreeListModel *
tree_node_get_tree_list_model (TreeNode *node)
{
- for (; !node->is_root; node = node->parent)
- { }
+ if (node->is_root)
+ return node->list;
+
+ for (node = node->parent; !node->is_root; node = node->parent)
+ {
+ /* This can happen during collapsing of a parent node */
+ if (node->children == NULL)
+ return NULL;
+ }
return node->list;
}
@@ -316,6 +323,9 @@ gtk_tree_list_model_items_changed_cb (GListModel *model,
guint i, tree_position, tree_removed, tree_added, n_local;
self = tree_node_get_tree_list_model (node);
+ if (self == NULL)
+ return;
+
n_local = g_list_model_get_n_items (model) - added + removed;
if (position < n_local)
@@ -405,10 +415,16 @@ gtk_tree_list_model_clear_node (gpointer data)
TreeNode *node = data;
if (node->row)
- gtk_tree_list_row_destroy (node->row);
+ {
+ g_object_freeze_notify (G_OBJECT (node->row));
+ gtk_tree_list_row_destroy (node->row);
+ }
gtk_tree_list_model_clear_node_children (node);
+ if (node->row)
+ g_object_thaw_notify (G_OBJECT (node->row));
+
g_clear_object (&node->item);
}
@@ -945,16 +961,12 @@ G_DEFINE_TYPE (GtkTreeListRow, gtk_tree_list_row, G_TYPE_OBJECT)
static void
gtk_tree_list_row_destroy (GtkTreeListRow *self)
{
- g_object_freeze_notify (G_OBJECT (self));
-
self->node = NULL;
/* FIXME: We could check some properties to avoid excess notifies */
g_object_notify_by_pspec (G_OBJECT (self), row_properties[ROW_PROP_DEPTH]);
g_object_notify_by_pspec (G_OBJECT (self), row_properties[ROW_PROP_EXPANDABLE]);
g_object_notify_by_pspec (G_OBJECT (self), row_properties[ROW_PROP_EXPANDED]);
-
- g_object_thaw_notify (G_OBJECT (self));
}
static void
@@ -1180,6 +1192,8 @@ gtk_tree_list_row_set_expanded (GtkTreeListRow *self,
return;
list = tree_node_get_tree_list_model (self->node);
+ if (list == NULL)
+ return;
if (expanded)
{
@@ -1255,6 +1269,9 @@ gtk_tree_list_row_is_expandable (GtkTreeListRow *self)
return TRUE;
list = tree_node_get_tree_list_model (self->node);
+ if (list == NULL)
+ return FALSE;
+
model = tree_node_create_model (list, self->node);
if (model)
{
desktop/toolkit/gtk/gtk4/files/b686ce1c.diff
+13
View File
@@ -0,0 +1,13 @@
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index a76e4824f2ed1c0e2c1f002257c3fcbda60c9f16..40f37523cd35301a8d3d3eb655d9cab7bdb7eee8 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -208,6 +208,8 @@ gdk_x11_surface_update_size (GdkX11Surface *self,
cairo_surface_set_device_scale (self->cairo_surface, scale, scale);
}
+ gdk_surface_invalidate_rect (surface, NULL);
+
return TRUE;
}
desktop/toolkit/gtk/gtk4/pspec.xml
+12
View File
@@ -54,6 +54,11 @@
<Dependency>python-docutils</Dependency>
<Dependency>python3-docutils</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">4f476837.diff</Patch>
<Patch level="1">541de345.diff</Patch>
<Patch level="1">b686ce1c.diff</Patch>
</Patches>
</Source>
<Package>
@@ -194,6 +199,13 @@
</Package>
<History>
<Update release="18">
<Date>2023-05-30</Date>
<Version>4.10.3</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="17">
<Date>2023-05-13</Date>
<Version>4.10.3</Version>