AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

gtk-demo: Stop using GdkEventWindowState

Browse Source 
Use GdkWindow::state instead - the event is going away.
This commit is contained in:
Matthias Clasen 2017-12-14 22:10:44 -05:00
parent 2c267a3cf1
commit ce251133c0
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
demos/gtk-demo/application.c
View File

@ -469,22 +469,33 @@ demo_application_window_size_allocate (GtkWidget *widget,
gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height); gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
} }
static gboolean static void
demo_application_window_state_event (GtkWidget *widget, window_state_changed (GtkWidget *widget)
GdkEventWindowState *event)
{ {
DemoApplicationWindow *window = (DemoApplicationWindow *)widget; DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
gboolean res = GDK_EVENT_PROPAGATE; GdkWindowState new_state;
GdkWindowState changed, new_state;
if (GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event) new_state = gdk_window_get_state (gtk_widget_get_window (widget));
res = GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event (widget, event);
gdk_event_get_window_state ((GdkEvent *)event, &changed, &new_state);
window->maximized = (new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0; window->maximized = (new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
window->fullscreen = (new_state & GDK_WINDOW_STATE_FULLSCREEN) != 0; window->fullscreen = (new_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
}
return res; static void
demo_application_window_realize (GtkWidget *widget)
{
GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);
g_signal_connect_swapped (gtk_widget_get_window (widget), "notify::state",
G_CALLBACK (window_state_changed), widget);
}
static void
demo_application_window_unrealize (GtkWidget *widget)
{
g_signal_handlers_disconnect_by_func (gtk_widget_get_window (widget),
window_state_changed, widget);
GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
} }
static void static void
@ -506,7 +517,8 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
object_class->constructed = demo_application_window_constructed; object_class->constructed = demo_application_window_constructed;
widget_class->size_allocate = demo_application_window_size_allocate; widget_class->size_allocate = demo_application_window_size_allocate;
widget_class->window_state_event = demo_application_window_state_event; widget_class->realize = demo_application_window_realize;
widget_class->unrealize = demo_application_window_unrealize;
widget_class->destroy = demo_application_window_destroy; widget_class->destroy = demo_application_window_destroy;
gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");