[gtk+/wip/baedert/drawing: 121/130] paned: Fix clip node coordinates
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 121/130] paned: Fix clip node coordinates
- Date: Fri, 30 Jun 2017 10:01:32 +0000 (UTC)
commit d3e2202712eac8b2d98d48aac344d562f296cb68
Author: Timm Bäder <mail baedert org>
Date: Wed Jun 28 07:38:54 2017 +0200
paned: Fix clip node coordinates
gtk/gtkpaned.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 887999f..7ce9e5d 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1420,15 +1420,14 @@ gtk_paned_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (GTK_PANED (widget));
- GtkAllocation widget_allocation;
GtkAllocation child_allocation;
+ int width, height;
- gtk_widget_get_allocation (widget, &widget_allocation);
+ gtk_widget_get_content_size (widget, &width, &height);
gtk_snapshot_push_clip (snapshot,
&GRAPHENE_RECT_INIT (
0, 0,
- widget_allocation.width,
- widget_allocation.height
+ width, height
),
"GtkPaned");
@@ -1438,11 +1437,11 @@ gtk_paned_snapshot (GtkWidget *widget,
if (priv->child1 && gtk_widget_get_visible (priv->child1))
{
- gtk_widget_get_allocation (priv->child1, &child_allocation);
+ gtk_widget_get_outer_allocation (priv->child1, &child_allocation);
gtk_snapshot_push_clip (snapshot,
&GRAPHENE_RECT_INIT (
- child_allocation.x - widget_allocation.x,
- child_allocation.y - widget_allocation.y,
+ child_allocation.x,
+ child_allocation.y,
child_allocation.width,
child_allocation.height
),
@@ -1453,11 +1452,11 @@ gtk_paned_snapshot (GtkWidget *widget,
if (priv->child2 && gtk_widget_get_visible (priv->child2))
{
- gtk_widget_get_allocation (priv->child2, &child_allocation);
+ gtk_widget_get_outer_allocation (priv->child2, &child_allocation);
gtk_snapshot_push_clip (snapshot,
&GRAPHENE_RECT_INIT (
- child_allocation.x - widget_allocation.x,
- child_allocation.y - widget_allocation.y,
+ child_allocation.x,
+ child_allocation.y,
child_allocation.width,
child_allocation.height
),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]