[gtk+/wip/matthiasc/render-node-vfunc: 6/6] check button: Update for new box gadget functionality
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/render-node-vfunc: 6/6] check button: Update for new box gadget functionality
- Date: Fri, 28 Oct 2016 16:59:39 +0000 (UTC)
commit dd5c64488fc042d52e36961fc5fda87428a8a764
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Oct 28 12:58:18 2016 -0400
check button: Update for new box gadget functionality
The box gadget now does the render node conversion for
all its children, so we have less work to do.
gtk/gtkcheckbutton.c | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 646ea6a..5d0d8af 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -387,28 +387,13 @@ gtk_check_button_get_render_node (GtkWidget *widget,
GskRenderer *renderer)
{
GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (GTK_CHECK_BUTTON (widget));
- GskRenderNode *res;
- GskRenderNode *node;
if (!gtk_toggle_button_get_mode (GTK_TOGGLE_BUTTON (widget)))
return GTK_WIDGET_CLASS (gtk_check_button_parent_class)->get_render_node (widget, renderer);
-
- res = gtk_css_gadget_get_render_node (priv->gadget,
- renderer,
- gtk_widget_has_visible_focus (widget));
-
- if (res == NULL)
- return NULL;
-
- node = gtk_css_gadget_get_render_node (priv->indicator_gadget,
- renderer,
- FALSE);
- gsk_render_node_append_child (res, node);
- gsk_render_node_unref (node);
-
- gtk_container_propagate_render_node (GTK_CONTAINER (widget), renderer, res);
-
- return res;
+ else
+ return gtk_css_gadget_get_render_node (priv->gadget,
+ renderer,
+ gtk_widget_has_visible_focus (widget));
}
GtkCssNode *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]