[gtk+] overlay: Use actual size of the overlay when positioning
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] overlay: Use actual size of the overlay when positioning
- Date: Thu, 20 Aug 2015 22:47:45 +0000 (UTC)
commit 2039ab8853c10e2b34a0bd7d0bd17b2ef5855db0
Author: Benjamin Otte <otte redhat com>
Date: Fri Aug 21 00:44:17 2015 +0200
overlay: Use actual size of the overlay when positioning
Previously we were using the natural requested size which is unrelated.
gtk/gtkoverlay.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 48278e5..75253a5 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -369,10 +369,10 @@ gtk_overlay_get_child_position (GtkOverlay *overlay,
alloc->width = MAX (alloc->width, main_alloc.width);
break;
case GTK_ALIGN_CENTER:
- alloc->x += main_alloc.width / 2 - req.width / 2;
+ alloc->x += main_alloc.width / 2 - alloc->width / 2;
break;
case GTK_ALIGN_END:
- alloc->x += main_alloc.width - req.width;
+ alloc->x += main_alloc.width - alloc->width;
break;
case GTK_ALIGN_BASELINE:
default:
@@ -392,10 +392,10 @@ gtk_overlay_get_child_position (GtkOverlay *overlay,
alloc->height = MAX (alloc->height, main_alloc.height);
break;
case GTK_ALIGN_CENTER:
- alloc->y += main_alloc.height / 2 - req.height / 2;
+ alloc->y += main_alloc.height / 2 - alloc->height / 2;
break;
case GTK_ALIGN_END:
- alloc->y += main_alloc.height - req.height;
+ alloc->y += main_alloc.height - alloc->height;
break;
case GTK_ALIGN_BASELINE:
default:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]