[gtk/present-toplevel-2: 24/59] broadway: coding style fixes
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/present-toplevel-2: 24/59] broadway: coding style fixes
- Date: Thu, 12 Mar 2020 18:59:25 +0000 (UTC)
commit ca544c52ce2670300913eef8ede02de4c9308c5e
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Mar 9 23:28:16 2020 -0400
broadway: coding style fixes
gdk/broadway/gdksurface-broadway.c | 88 +++++++++++++++++++++-----------------
1 file changed, 48 insertions(+), 40 deletions(-)
---
diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 0cd8a769c0..51ed17e165 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -28,18 +28,18 @@
#include "gdksurface-broadway.h"
#include "gdkbroadwaydisplay.h"
+#include "gdkdeviceprivate.h"
+#include "gdkdisplay-broadway.h"
#include "gdkdisplay.h"
-#include "gdksurfaceprivate.h"
-#include "gdkpopupprivate.h"
-#include "gdktoplevelprivate.h"
#include "gdkdragsurfaceprivate.h"
-#include "gdkdisplay-broadway.h"
-#include "gdkprivate-broadway.h"
-#include "gdkinternals.h"
-#include "gdkdeviceprivate.h"
#include "gdkeventsource.h"
-#include "gdktextureprivate.h"
#include "gdkframeclockidleprivate.h"
+#include "gdkinternals.h"
+#include "gdkpopupprivate.h"
+#include "gdkprivate-broadway.h"
+#include "gdksurfaceprivate.h"
+#include "gdktextureprivate.h"
+#include "gdktoplevelprivate.h"
#include <stdlib.h>
#include <stdio.h>
@@ -1479,7 +1479,8 @@ typedef struct
GdkBroadwaySurface parent_instance;
} GdkBroadwayPopup;
-typedef struct {
+typedef struct
+{
GdkBroadwaySurfaceClass parent_class;
} GdkBroadwayPopupClass;
@@ -1598,11 +1599,13 @@ gdk_broadway_popup_iface_init (GdkPopupInterface *iface)
iface->get_position_y = gdk_broadway_popup_get_position_y;
}
-typedef struct {
+typedef struct
+{
GdkBroadwaySurface parent_instance;
} GdkBroadwayToplevel;
-typedef struct {
+typedef struct
+{
GdkBroadwaySurfaceClass parent_class;
} GdkBroadwayToplevelClass;
@@ -1617,7 +1620,6 @@ gdk_broadway_toplevel_init (GdkBroadwayToplevel *toplevel)
{
}
-
static void
gdk_broadway_toplevel_set_property (GObject *object,
guint prop_id,
@@ -1744,6 +1746,30 @@ gdk_broadway_toplevel_class_init (GdkBroadwayToplevelClass *class)
gdk_toplevel_install_properties (object_class, 1);
}
+static void
+show_surface (GdkSurface *surface)
+{
+ gboolean was_mapped;
+
+ if (surface->destroyed)
+ return;
+
+ was_mapped = GDK_SURFACE_IS_MAPPED (surface);
+
+ if (!was_mapped)
+ gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
+
+ _gdk_surface_update_viewable (surface);
+
+ gdk_broadway_surface_show (surface, FALSE);
+
+ if (!was_mapped)
+ {
+ if (gdk_surface_is_viewable (surface))
+ gdk_surface_invalidate_rect (surface, NULL);
+ }
+}
+
static gboolean
gdk_broadway_toplevel_present (GdkToplevel *toplevel,
int width,
@@ -1779,27 +1805,7 @@ gdk_broadway_toplevel_present (GdkToplevel *toplevel,
gdk_broadway_surface_set_modal_hint (surface, gdk_toplevel_layout_get_modal (layout));
- {
- gboolean was_mapped;
-
- if (surface->destroyed)
- return TRUE;
-
- was_mapped = GDK_SURFACE_IS_MAPPED (surface);
-
- if (!was_mapped)
- gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
-
- _gdk_surface_update_viewable (surface);
-
- gdk_broadway_surface_show (surface, FALSE);
-
- if (!was_mapped)
- {
- if (gdk_surface_is_viewable (surface))
- gdk_surface_invalidate_rect (surface, NULL);
- }
- }
+ show_surface (surface);
return TRUE;
}
@@ -1820,14 +1826,14 @@ gdk_broadway_toplevel_lower (GdkToplevel *toplevel)
static void
gdk_broadway_toplevel_focus (GdkToplevel *toplevel,
- guint32 timestamp)
+ guint32 timestamp)
{
gdk_broadway_surface_focus (GDK_SURFACE (toplevel), timestamp);
}
static gboolean
gdk_broadway_toplevel_show_window_menu (GdkToplevel *toplevel,
- GdkEvent *event)
+ GdkEvent *event)
{
return FALSE;
}
@@ -1842,11 +1848,13 @@ gdk_broadway_toplevel_iface_init (GdkToplevelInterface *iface)
iface->show_window_menu = gdk_broadway_toplevel_show_window_menu;
}
-typedef struct {
+typedef struct
+{
GdkBroadwaySurface parent_instance;
} GdkBroadwayDragSurface;
-typedef struct {
+typedef struct
+{
GdkBroadwaySurfaceClass parent_class;
} GdkBroadwayDragSurfaceClass;
@@ -1868,13 +1876,13 @@ gdk_broadway_drag_surface_class_init (GdkBroadwayDragSurfaceClass *class)
static gboolean
gdk_broadway_drag_surface_present (GdkDragSurface *drag_surface,
- int width,
- int height)
+ int width,
+ int height)
{
GdkSurface *surface = GDK_SURFACE (drag_surface);
gdk_broadway_surface_toplevel_resize (surface, width, height);
- gdk_broadway_surface_show (surface, FALSE);
+ show_surface (surface);
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]