AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

surface: Make surface-type a property

Browse Source 
Make surface-type a construct-only property,
so we can set it before the frame clock.
This commit is contained in:
Matthias Clasen 2019-05-22 22:35:09 +00:00
parent c638a0aa59
commit 44be64278b
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/broadway/gdksurface-broadway.c
View File

@ -209,13 +209,13 @@ _gdk_broadway_display_create_surface (GdkDisplay *display,
frame_clock = _gdk_frame_clock_idle_new (); frame_clock = _gdk_frame_clock_idle_new ();
surface = g_object_new (GDK_TYPE_BROADWAY_SURFACE, surface = g_object_new (GDK_TYPE_BROADWAY_SURFACE,
"surface-type", surface_type,
"display", display, "display", display,
"frame-clock", frame_clock, "frame-clock", frame_clock,
NULL); NULL);
g_object_unref (frame_clock); g_object_unref (frame_clock);
surface->surface_type = surface_type;
surface->parent = parent; surface->parent = parent;
surface->x = x; surface->x = x;
surface->y = y; surface->y = y;

16
gdk/gdksurface.c
View File

@ -77,6 +77,7 @@ enum {
enum { enum {
PROP_0, PROP_0,
PROP_SURFACE_TYPE,
PROP_CURSOR, PROP_CURSOR,
PROP_DISPLAY, PROP_DISPLAY,
PROP_PARENT, PROP_PARENT,
@ -473,6 +474,13 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
properties[PROP_SURFACE_TYPE] =
g_param_spec_enum ("surface-type",
P_("Surface type"),
P_("Surface type"),
GDK_TYPE_SURFACE_TYPE, GDK_SURFACE_TOPLEVEL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, LAST_PROP, properties); g_object_class_install_properties (object_class, LAST_PROP, properties);
/** /**
@ -659,6 +667,10 @@ gdk_surface_set_property (GObject *object,
surface->autohide = g_value_get_boolean (value); surface->autohide = g_value_get_boolean (value);
break; break;
case PROP_SURFACE_TYPE:
surface->surface_type = g_value_get_enum (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -703,6 +715,10 @@ gdk_surface_get_property (GObject *object,
g_value_set_boolean (value, surface->autohide); g_value_set_boolean (value, surface->autohide);
break; break;
case PROP_SURFACE_TYPE:
g_value_set_enum (value, surface->surface_type);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;

2
gdk/wayland/gdksurface-wayland.c
View File

@ -516,6 +516,7 @@ _gdk_wayland_display_create_surface (GdkDisplay *display,
frame_clock = _gdk_frame_clock_idle_new (); frame_clock = _gdk_frame_clock_idle_new ();
surface = g_object_new (GDK_TYPE_WAYLAND_SURFACE, surface = g_object_new (GDK_TYPE_WAYLAND_SURFACE,
"surface-type", surface_type,
"display", display, "display", display,
"parent", parent, "parent", parent,
"frame-clock", frame_clock, "frame-clock", frame_clock,
@ -534,7 +535,6 @@ _gdk_wayland_display_create_surface (GdkDisplay *display,
height = 65535; height = 65535;
} }
surface->surface_type = surface_type;
surface->x = x; surface->x = x;
surface->y = y; surface->y = y;
surface->width = width; surface->width = width;

2
gdk/x11/gdksurface-x11.c
View File

@ -820,13 +820,13 @@ _gdk_x11_display_create_surface (GdkDisplay *display,
frame_clock = _gdk_frame_clock_idle_new (); frame_clock = _gdk_frame_clock_idle_new ();
surface = g_object_new (GDK_TYPE_X11_SURFACE, surface = g_object_new (GDK_TYPE_X11_SURFACE,
"surface-type", surface_type,
"display", display, "display", display,
"frame-clock", frame_clock, "frame-clock", frame_clock,
NULL); NULL);
g_object_unref (frame_clock); g_object_unref (frame_clock);
surface->surface_type = surface_type;
surface->parent = parent; surface->parent = parent;
surface->x = x; surface->x = x;
surface->y = y; surface->y = y;