[gtk/wip/matthiasc/popup4: 7/106] widget: guard popover-specific code paths
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup4: 7/106] widget: guard popover-specific code paths
- Date: Wed, 24 Apr 2019 11:37:51 +0000 (UTC)
commit 18b26c8e70740d9ea508e39055b6689ef42deea6
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Feb 24 18:41:26 2019 -0500
widget: guard popover-specific code paths
This is essentially a special case just for GtkPopover,
which is the last widget with a child surface.
gtk/gtkwidget.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 362f6605ac..fa8c1b4a6b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4460,7 +4460,8 @@ gtk_widget_allocate (GtkWidget *widget,
{
/* Still have to move the window... */
if (_gtk_widget_get_realized (widget) &&
- _gtk_widget_get_has_surface (widget))
+ _gtk_widget_get_has_surface (widget) &&
+ GTK_IS_POPOVER (widget))
{
GtkAllocation window_alloc;
@@ -4672,7 +4673,8 @@ gtk_widget_real_size_allocate (GtkWidget *widget,
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
if (_gtk_widget_get_realized (widget) &&
- _gtk_widget_get_has_surface (widget))
+ _gtk_widget_get_has_surface (widget) &&
+ GTK_IS_POPOVER (widget))
{
GtkAllocation window_alloc;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]