diff options
| author | Carlos Garnacho <mrgarnacho@gmail.com> | 2019-01-07 18:14:33 +0000 |
|---|---|---|
| committer | Carlos Garnacho <mrgarnacho@gmail.com> | 2019-01-07 18:14:33 +0000 |
| commit | b52dea7a10fbba1a3c5cdda3fe3a304279156dd3 (patch) | |
| tree | 578b528611c65566a19e53688a04a441c0958666 | |
| parent | 7bb588827222268c3b5fba41cb0b8593daad14d4 (diff) | |
| parent | dc68d04c32b3334c5036a1874625bdb24105e557 (diff) | |
| download | gtk+-b52dea7a10fbba1a3c5cdda3fe3a304279156dd3.tar.gz | |
Merge branch 'fix-corner-resize' into 'master'
Fix resize corners
See merge request GNOME/gtk!481
| -rw-r--r-- | gtk/gtkwindow.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index dd77d35665..75e962ed42 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1774,8 +1774,7 @@ edge_under_coordinates (GtkWindow *window, edge != GDK_SURFACE_EDGE_SOUTH) return FALSE; - if (supports_edge_constraints && - (edge == GDK_SURFACE_EDGE_NORTH || + if ((edge == GDK_SURFACE_EDGE_NORTH || edge == GDK_SURFACE_EDGE_SOUTH) && (priv->edge_constraints & constraints_for_edge (GDK_SURFACE_EDGE_WEST))) return FALSE; @@ -1789,8 +1788,7 @@ edge_under_coordinates (GtkWindow *window, edge != GDK_SURFACE_EDGE_SOUTH) return FALSE; - if (supports_edge_constraints && - (edge == GDK_SURFACE_EDGE_NORTH || + if ((edge == GDK_SURFACE_EDGE_NORTH || edge == GDK_SURFACE_EDGE_SOUTH) && (priv->edge_constraints & constraints_for_edge (GDK_SURFACE_EDGE_EAST))) return FALSE; @@ -1809,8 +1807,7 @@ edge_under_coordinates (GtkWindow *window, edge != GDK_SURFACE_EDGE_WEST) return FALSE; - if (supports_edge_constraints && - (edge == GDK_SURFACE_EDGE_EAST || + if ((edge == GDK_SURFACE_EDGE_EAST || edge == GDK_SURFACE_EDGE_WEST) && (priv->edge_constraints & constraints_for_edge (GDK_SURFACE_EDGE_NORTH))) return FALSE; @@ -1824,8 +1821,7 @@ edge_under_coordinates (GtkWindow *window, edge != GDK_SURFACE_EDGE_WEST) return FALSE; - if (supports_edge_constraints && - (edge == GDK_SURFACE_EDGE_EAST || + if ((edge == GDK_SURFACE_EDGE_EAST || edge == GDK_SURFACE_EDGE_WEST) && (priv->edge_constraints & constraints_for_edge (GDK_SURFACE_EDGE_SOUTH))) return FALSE; |