[gtk: 10/10] Merge branch 'gtk-demo-fixes' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 10/10] Merge branch 'gtk-demo-fixes' into 'master'
- Date: Tue, 24 Dec 2019 08:48:24 +0000 (UTC)
commit 3644d3a100d7baa12ffec347a6dca201f27b3aee
Merge: 2a7b5d8229 9e3147f78d
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Dec 24 08:47:28 2019 +0000
Merge branch 'gtk-demo-fixes' into 'master'
Gtk demo fixes
See merge request GNOME/gtk!1266
demos/gtk-demo/application.ui | 26 +++++--------
demos/gtk-demo/assistant.c | 5 ++-
demos/gtk-demo/dnd.c | 3 ++
demos/gtk-demo/font_features.c | 4 +-
gtk/gtkcellrendererspin.c | 67 ++++++++++++++++++++------------
gtk/gtkcellrenderertext.c | 14 +++----
gtk/gtkcustompaperunixdialog.c | 1 +
gtk/gtkspinbutton.c | 87 ++++++++++++++++++++++++++++++++++++++++--
gtk/gtktreeview.c | 3 ++
9 files changed, 155 insertions(+), 55 deletions(-)
---
diff --cc gtk/gtktreeview.c
index e395d51da8,291e7abc66..a4aeccc1be
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@@ -8173,8 -8193,11 +8173,11 @@@ gtk_tree_view_put (GtkTreeView *t
child->column = column;
child->border = *border;
- tree_view->priv->children = g_list_append (tree_view->priv->children, child);
+ tree_view->children = g_list_append (tree_view->children, child);
+ gtk_css_node_insert_after (gtk_widget_get_css_node (GTK_WIDGET (tree_view)),
+ gtk_widget_get_css_node (child_widget),
+ tree_view->priv->header_node);
gtk_widget_set_parent (child_widget, GTK_WIDGET (tree_view));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]