AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/otte/for-master' into 'master'

Browse Source 
Wip/otte/for master

Closes #3280

See merge request GNOME/gtk!2725
This commit is contained in:
Benjamin Otte 2020-10-20 14:05:49 +00:00
commit 45400fe381
30 changed files with 36 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gskpango.c
View File

@ -26,7 +26,6 @@
#include "gtktextlayoutprivate.h"
#include "gtktextviewprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include <math.h>

7
gtk/gtkbox.c
View File

@ -58,7 +58,6 @@
#include "gtkbox.h"
#include "gtkboxlayout.h"
#include "gtkbuildable.h"
#include "gtkcsspositionvalueprivate.h"
#include "gtkintl.h"
#include "gtkorientable.h"
#include "gtkprivate.h"
@ -504,9 +503,6 @@ gtk_box_insert_child_after (GtkBox *box,
return;
gtk_widget_insert_after (child, widget, sibling);
gtk_css_node_insert_after (gtk_widget_get_css_node (widget),
gtk_widget_get_css_node (child),
sibling ? gtk_widget_get_css_node (sibling) : NULL);
}
/**
@ -542,9 +538,6 @@ gtk_box_reorder_child_after (GtkBox *box,
return;
gtk_widget_insert_after (child, widget, sibling);
gtk_css_node_insert_after (gtk_widget_get_css_node (widget),
gtk_widget_get_css_node (child),
sibling ? gtk_widget_get_css_node (sibling) : NULL);
}
/**

1
gtk/gtkbuiltinicon.c
View File

@ -20,7 +20,6 @@
#include "config.h"
#include "gtkcssnodeprivate.h"
#include "gtkstylecontextprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkbuiltiniconprivate.h"

1
gtk/gtkcenterbox.c
View File

@ -55,7 +55,6 @@
#include "config.h"
#include "gtkcenterbox.h"
#include "gtkcenterlayout.h"
#include "gtkcssnodeprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkorientable.h"
#include "gtkbuildable.h"

1
gtk/gtkcheckbutton.c
View File

@ -29,7 +29,6 @@
#include "gtkactionhelperprivate.h"
#include "gtkboxlayout.h"
#include "gtkbuiltiniconprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkgestureclick.h"
#include "gtkintl.h"

1
gtk/gtkcolorswatch.c
View File

@ -21,7 +21,6 @@
#include "gtkbox.h"
#include "gtkcolorchooserprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkdragsource.h"
#include "gtkdroptarget.h"
#include "gtkgesturelongpress.h"

1
gtk/gtkdragicon.c
View File

@ -23,7 +23,6 @@
#include "gtkintl.h"
#include "gtkwidgetprivate.h"
#include "gtkcssstyleprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcsstypesprivate.h"
#include "gtknativeprivate.h"
#include "gtkpicture.h"

14
gtk/gtkentry.c
View File

@ -36,7 +36,6 @@
#include "gtkbutton.h"
#include "gtkcelleditable.h"
#include "gtkcelllayout.h"
#include "gtkcssnodeprivate.h"
#include "gtkdebug.h"
#include "gtkeditable.h"
#include "gtkemojichooser.h"
@ -1509,14 +1508,9 @@ update_node_ordering (GtkEntry *entry)
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
EntryIconInfo *icon_info;
GtkEntryIconPosition first_icon_pos, second_icon_pos;
GtkCssNode *parent;
if (priv->progress_widget)
{
gtk_css_node_insert_before (gtk_widget_get_css_node (GTK_WIDGET (entry)),
gtk_widget_get_css_node (priv->progress_widget),
NULL);
}
gtk_widget_insert_before (priv->progress_widget, GTK_WIDGET (entry), NULL);
if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
{
@ -1529,15 +1523,13 @@ update_node_ordering (GtkEntry *entry)
second_icon_pos = GTK_ENTRY_ICON_SECONDARY;
}
parent = gtk_widget_get_css_node (GTK_WIDGET (entry));
icon_info = priv->icons[first_icon_pos];
if (icon_info)
gtk_css_node_insert_after (parent, gtk_widget_get_css_node (icon_info->widget), NULL);
gtk_widget_insert_after (icon_info->widget, GTK_WIDGET (entry), NULL);
icon_info = priv->icons[second_icon_pos];
if (icon_info)
gtk_css_node_insert_before (parent, gtk_widget_get_css_node (icon_info->widget), NULL);
gtk_widget_insert_before (icon_info->widget, GTK_WIDGET (entry), NULL);
}
static GtkEntryIconPosition

38
gtk/gtkflowbox.c
View File

@ -80,7 +80,6 @@
#include "gtkbinlayout.h"
#include "gtkbuildable.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkeventcontrollerkey.h"
#include "gtkgestureclick.h"
#include "gtkgesturedrag.h"
@ -4032,9 +4031,9 @@ gtk_flow_box_new (void)
}
static void
gtk_flow_box_insert_css_node (GtkFlowBox *box,
GtkWidget *child,
GSequenceIter *iter)
gtk_flow_box_insert_widget (GtkFlowBox *box,
GtkWidget *child,
GSequenceIter *iter)
{
GSequenceIter *prev_iter;
GtkWidget *sibling;
@ -4042,12 +4041,11 @@ gtk_flow_box_insert_css_node (GtkFlowBox *box,
prev_iter = g_sequence_iter_prev (iter);
if (prev_iter != iter)
{
sibling = g_sequence_get (prev_iter);
gtk_css_node_insert_after (gtk_widget_get_css_node (GTK_WIDGET (box)),
gtk_widget_get_css_node (child),
gtk_widget_get_css_node (sibling));
}
sibling = g_sequence_get (prev_iter);
else
sibling = NULL;
gtk_widget_insert_after (child, GTK_WIDGET (box), sibling);
}
/**
@ -4100,10 +4098,8 @@ gtk_flow_box_insert (GtkFlowBox *box,
iter = g_sequence_insert_before (pos, child);
}
gtk_flow_box_insert_css_node (box, GTK_WIDGET (child), iter);
CHILD_PRIV (child)->iter = iter;
gtk_widget_set_parent (GTK_WIDGET (child), GTK_WIDGET (box));
gtk_flow_box_insert_widget (box, GTK_WIDGET (child), iter);
gtk_flow_box_apply_filter (box, child);
}
@ -4917,22 +4913,14 @@ gtk_flow_box_sort (GtkFlowBoxChild *a,
}
static void
gtk_flow_box_css_node_foreach (gpointer data,
gpointer user_data)
gtk_flow_box_reorder_foreach (gpointer data,
gpointer user_data)
{
GtkWidget **previous = user_data;
GtkWidget *row = data;
GtkCssNode *row_node;
GtkCssNode *prev_node;
if (*previous)
{
prev_node = gtk_widget_get_css_node (*previous);
row_node = gtk_widget_get_css_node (row);
gtk_css_node_insert_after (gtk_css_node_get_parent (row_node),
row_node,
prev_node);
}
gtk_widget_insert_after (row, _gtk_widget_get_parent (row), *previous);
*previous = row;
}
@ -4959,7 +4947,7 @@ gtk_flow_box_invalidate_sort (GtkFlowBox *box)
if (priv->sort_func != NULL)
{
g_sequence_sort (priv->children, (GCompareDataFunc)gtk_flow_box_sort, box);
g_sequence_foreach (priv->children, gtk_flow_box_css_node_foreach, &previous);
g_sequence_foreach (priv->children, gtk_flow_box_reorder_foreach, &previous);
gtk_widget_queue_resize (GTK_WIDGET (box));
}
}

1
gtk/gtkframe.c
View File

@ -30,7 +30,6 @@
#include "gtktypebuiltins.h"
#include "gtkintl.h"
#include "gtkbuildable.h"
#include "gtkcssnodeprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkstylecontextprivate.h"
#include "gtkcssstylepropertyprivate.h"

1
gtk/gtkheaderbar.c
View File

@ -25,7 +25,6 @@
#include "gtkbox.h"
#include "gtkbuildable.h"
#include "gtkcenterbox.h"
#include "gtkcssnodeprivate.h"
#include "gtkintl.h"
#include "gtklabel.h"
#include "gtknative.h"

1
gtk/gtkiconhelper.c
View File

@ -24,7 +24,6 @@
#include <math.h>
#include "gtkcssenumvalueprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkcssstyleprivate.h"
#include "gtkcssstylepropertyprivate.h"

1
gtk/gtkiconview.c
View File

@ -26,7 +26,6 @@
#include "gtkcellrenderer.h"
#include "gtkcellrendererpixbuf.h"
#include "gtkcellrenderertext.h"
#include "gtkcssnodeprivate.h"
#include "gtkdragsource.h"
#include "gtkentry.h"
#include "gtkintl.h"

1
gtk/gtklabel.c
View File

@ -28,7 +28,6 @@
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkeventcontrollermotion.h"
#include "gtkeventcontrollerfocus.h"

1
gtk/gtklevelbar.c
View File

@ -125,7 +125,6 @@
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkgizmoprivate.h"
#include "gtkintl.h"
#include "gtklevelbar.h"

17
gtk/gtklistbox.c
View File

@ -24,7 +24,6 @@
#include "gtkadjustmentprivate.h"
#include "gtkbinlayout.h"
#include "gtkbuildable.h"
#include "gtkcssnodeprivate.h"
#include "gtkgestureclick.h"
#include "gtkintl.h"
#include "gtkmain.h"
@ -1260,22 +1259,14 @@ do_sort (GtkListBoxRow *a,
}
static void
gtk_list_box_css_node_foreach (gpointer data,
gpointer user_data)
gtk_list_box_reorder_foreach (gpointer data,
gpointer user_data)
{
GtkWidget **previous = user_data;
GtkWidget *row = data;
GtkCssNode *row_node;
GtkCssNode *prev_node;
if (*previous)
{
prev_node = gtk_widget_get_css_node (*previous);
row_node = gtk_widget_get_css_node (row);
gtk_css_node_insert_after (gtk_css_node_get_parent (row_node),
row_node,
prev_node);
}
gtk_widget_insert_after (row, _gtk_widget_get_parent (row), *previous);
*previous = row;
}
@ -1299,7 +1290,7 @@ gtk_list_box_invalidate_sort (GtkListBox *box)
return;
g_sequence_sort (box->children, (GCompareDataFunc)do_sort, box);
g_sequence_foreach (box->children, gtk_list_box_css_node_foreach, &previous);
g_sequence_foreach (box->children, gtk_list_box_reorder_foreach, &previous);
gtk_list_box_invalidate_headers (box);
gtk_widget_queue_resize (GTK_WIDGET (box));

8
gtk/gtklistitemwidget.c
View File

@ -22,7 +22,6 @@
#include "gtklistitemwidgetprivate.h"
#include "gtkbinlayout.h"
#include "gtkcssnodeprivate.h"
#include "gtkeventcontrollerfocus.h"
#include "gtkeventcontrollermotion.h"
#include "gtkgestureclick.h"
@ -636,12 +635,7 @@ gtk_list_item_widget_reorder_child (GtkListItemWidget *self,
}
if (child != sibling)
{
gtk_widget_insert_after (child, widget, sibling);
gtk_css_node_insert_after (gtk_widget_get_css_node (widget),
gtk_widget_get_css_node (child),
sibling ? gtk_widget_get_css_node (sibling) : NULL);
}
gtk_widget_insert_after (child, widget, sibling);
}
void

1
gtk/gtknative.c
View File

@ -20,7 +20,6 @@
#include "config.h"
#include "gtknativeprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkwidgetprivate.h"
#include "gdk/gdk-private.h"
#include "gtkprivate.h"

25
gtk/gtknotebook.c
View File

@ -6143,9 +6143,6 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook)
if (notebook->show_tabs)
{
gtk_widget_insert_before (notebook->header_widget, GTK_WIDGET (notebook), notebook->stack_widget);
gtk_css_node_insert_before (gtk_widget_get_css_node (GTK_WIDGET (notebook)),
gtk_widget_get_css_node (notebook->header_widget),
gtk_widget_get_css_node (notebook->stack_widget));
}
gtk_orientable_set_orientation (GTK_ORIENTABLE (layout), GTK_ORIENTATION_VERTICAL);
@ -6160,9 +6157,6 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook)
if (notebook->show_tabs)
{
gtk_widget_insert_after (notebook->header_widget, GTK_WIDGET (notebook), notebook->stack_widget);
gtk_css_node_insert_after (gtk_widget_get_css_node (GTK_WIDGET (notebook)),
gtk_widget_get_css_node (notebook->header_widget),
gtk_widget_get_css_node (notebook->stack_widget));
}
gtk_orientable_set_orientation (GTK_ORIENTABLE (layout), GTK_ORIENTATION_VERTICAL);
@ -6177,9 +6171,6 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook)
if (notebook->show_tabs)
{
gtk_widget_insert_before (notebook->header_widget, GTK_WIDGET (notebook), notebook->stack_widget);
gtk_css_node_insert_before (gtk_widget_get_css_node (GTK_WIDGET (notebook)),
gtk_widget_get_css_node (notebook->header_widget),
gtk_widget_get_css_node (notebook->stack_widget));
}
gtk_orientable_set_orientation (GTK_ORIENTABLE (layout), GTK_ORIENTATION_HORIZONTAL);
@ -6194,9 +6185,6 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook)
if (notebook->show_tabs)
{
gtk_widget_insert_after (notebook->header_widget, GTK_WIDGET (notebook), notebook->stack_widget);
gtk_css_node_insert_after (gtk_widget_get_css_node (GTK_WIDGET (notebook)),
gtk_widget_get_css_node (notebook->header_widget),
gtk_widget_get_css_node (notebook->stack_widget));
}
gtk_orientable_set_orientation (GTK_ORIENTABLE (layout), GTK_ORIENTATION_HORIZONTAL);
@ -6676,7 +6664,7 @@ gtk_notebook_child_reordered (GtkNotebook *notebook,
GtkNotebookPage *page)
{
GList *list;
GtkCssNode *sibling;
GtkWidget *sibling;
list = g_list_find (notebook->children, page);
@ -6684,17 +6672,16 @@ gtk_notebook_child_reordered (GtkNotebook *notebook,
gtk_notebook_menu_item_recreate (notebook, list);
if (list->prev)
sibling = gtk_widget_get_css_node (GTK_NOTEBOOK_PAGE_FROM_LIST (list->prev)->tab_widget);
sibling = GTK_NOTEBOOK_PAGE_FROM_LIST (list->prev)->tab_widget;
else if (notebook->arrow_widget[ARROW_RIGHT_BEFORE])
sibling = gtk_widget_get_css_node (notebook->arrow_widget[ARROW_RIGHT_BEFORE]);
sibling = notebook->arrow_widget[ARROW_RIGHT_BEFORE];
else if (notebook->arrow_widget[ARROW_LEFT_BEFORE])
sibling = gtk_widget_get_css_node (notebook->arrow_widget[ARROW_LEFT_BEFORE]);
sibling = notebook->arrow_widget[ARROW_LEFT_BEFORE];
else
sibling = NULL;
gtk_css_node_insert_after (gtk_widget_get_css_node (notebook->tabs_widget),
gtk_widget_get_css_node (page->tab_widget),
sibling);
gtk_widget_insert_after (page->tab_widget, notebook->tabs_widget, sibling);
gtk_notebook_update_labels (notebook);
gtk_widget_queue_allocate (notebook->tabs_widget);
}

1
gtk/gtkpaned.c
View File

@ -27,7 +27,6 @@
#include "gtkpaned.h"
#include "gtkcssboxesprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkeventcontrollermotion.h"
#include "gtkgesturepan.h"

1
gtk/gtkpathbar.c
View File

@ -23,7 +23,6 @@
#include <string.h>
#include "gtkbox.h"
#include "gtkcssnodeprivate.h"
#include "gtkdragsource.h"
#include "gtkicontheme.h"
#include "gtkimage.h"

2
gtk/gtkpopover.c
View File

@ -103,7 +103,6 @@
#include "gtkwidgetprivate.h"
#include "gtkeventcontrollerkey.h"
#include "gtkeventcontrollerfocus.h"
#include "gtkcssnodeprivate.h"
#include "gtkbinlayout.h"
#include "gtkenums.h"
#include "gtktypebuiltins.h"
@ -115,7 +114,6 @@
#include "gtkmenusectionboxprivate.h"
#include "gdk/gdkeventsprivate.h"
#include "gtkpointerfocusprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtksnapshot.h"
#include "gtkshortcutmanager.h"

1
gtk/gtkprogressbar.c
View File

@ -27,7 +27,6 @@
#include "gtkprogressbar.h"
#include "gtkboxlayout.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtkgizmoprivate.h"

1
gtk/gtkrangeprivate.h
View File

@ -27,7 +27,6 @@
#include <gtk/gtkrange.h>
#include <gtk/gtkcssnodeprivate.h>
G_BEGIN_DECLS

1
gtk/gtkstylecontext.c
View File

@ -28,7 +28,6 @@
#include "gtkcssenumvalueprivate.h"
#include "gtkcssimagevalueprivate.h"
#include "gtkcssnodedeclarationprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkcsscolorvalueprivate.h"

1
gtk/gtktext.c
View File

@ -27,7 +27,6 @@
#include "gtkadjustment.h"
#include "gtkbox.h"
#include "gtkbutton.h"
#include "gtkcssnodeprivate.h"
#include "gtkdebug.h"
#include "gtkdragicon.h"
#include "gtkdragsource.h"

1
gtk/gtktextutil.c
View File

@ -33,7 +33,6 @@
#include "gtktextlayoutprivate.h"
#include "gtkintl.h"
#include "gtkwidgetprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssstyleprivate.h"
#include "gtkstylepropertyprivate.h"
#include "gtkcsscolorvalueprivate.h"

6
gtk/gtktreeview.c
View File

@ -10790,10 +10790,12 @@ gtk_tree_view_insert_column (GtkTreeView *tree_view,
column, position);
priv->n_columns++;
gtk_tree_view_update_button_position (tree_view, column);
_gtk_tree_view_column_set_tree_view (column, tree_view);
/* XXX: We need to reparent the node into the header, somebody make that a real widget */
gtk_css_node_set_parent (gtk_widget_get_css_node (gtk_tree_view_column_get_button (column)), NULL);
gtk_tree_view_update_button_position (tree_view, column);
if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
{
GList *list;

3
gtk/gtktreeviewcolumn.c
View File

@ -1324,7 +1324,8 @@ _gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
priv->tree_view = GTK_WIDGET (tree_view);
gtk_widget_set_parent (priv->button, GTK_WIDGET (tree_view));
/* avoid a warning with our messed up CSS nodes */
gtk_widget_insert_after (priv->button, GTK_WIDGET (tree_view), NULL);
priv->property_changed_signal =
g_signal_connect_swapped (tree_view,

9
gtk/gtkwidget.c
View File

@ -5741,12 +5741,9 @@ gtk_widget_reposition_after (GtkWidget *widget,
data.flags_to_unset = 0;
gtk_widget_propagate_state (widget, &data);
if (gtk_css_node_get_parent (priv->cssnode) == NULL)
{
gtk_css_node_insert_after (parent->priv->cssnode,
priv->cssnode,
previous_sibling ? previous_sibling->priv->cssnode : NULL);
}
gtk_css_node_insert_after (parent->priv->cssnode,
priv->cssnode,
previous_sibling ? previous_sibling->priv->cssnode : NULL);
_gtk_widget_update_parent_muxer (widget);