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

gdk: Remove leftovers from GdkScreen::size-changed removal

Browse Source
This commit is contained in:
Benjamin Otte 2017-10-30 02:30:05 +01:00
parent 481189867a
commit f29b7744bb
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkscreenprivate.h
View File

@ -49,8 +49,6 @@ struct _GdkScreenClass
GValue *value); GValue *value);
/* Signals: */ /* Signals: */
void (*size_changed) (GdkScreen *screen);
void (*composited_changed) (GdkScreen *screen);
void (*monitors_changed) (GdkScreen *screen); void (*monitors_changed) (GdkScreen *screen);
}; };

5
gdk/mir/gdkmirscreen.c
View File

@ -116,15 +116,10 @@ static void
config_changed_cb (MirConnection *connection, void *data) config_changed_cb (MirConnection *connection, void *data)
{ {
GdkMirScreen *screen = data; GdkMirScreen *screen = data;
gint old_width, old_height, new_width, new_height;
get_screen_size (screen->display_config, &old_width, &old_height);
update_display_config (screen); update_display_config (screen);
get_screen_size (screen->display_config, &new_width, &new_height);
g_signal_emit_by_name (screen, "monitors-changed"); g_signal_emit_by_name (screen, "monitors-changed");
if (old_width > 0 && (old_width != new_width || old_height != new_height))
g_signal_emit_by_name (screen, "size-changed");
} }
GdkScreen * GdkScreen *

17
gdk/win32/gdkscreen-win32.c
View File

@ -43,7 +43,7 @@ struct _GdkWin32ScreenClass
G_DEFINE_TYPE (GdkWin32Screen, gdk_win32_screen, GDK_TYPE_SCREEN) G_DEFINE_TYPE (GdkWin32Screen, gdk_win32_screen, GDK_TYPE_SCREEN)
static gboolean static void
init_root_window_size (GdkWin32Screen *screen) init_root_window_size (GdkWin32Screen *screen)
{ {
GdkRectangle result; GdkRectangle result;
@ -51,7 +51,6 @@ init_root_window_size (GdkWin32Screen *screen)
GdkDisplay *display = _gdk_display; GdkDisplay *display = _gdk_display;
int monitor_count; int monitor_count;
GdkMonitor *monitor; GdkMonitor *monitor;
gboolean changed;
GdkWindowImplWin32 *root_impl; GdkWindowImplWin32 *root_impl;
monitor_count = gdk_display_get_n_monitors (display); monitor_count = gdk_display_get_n_monitors (display);
@ -67,25 +66,20 @@ init_root_window_size (GdkWin32Screen *screen)
gdk_rectangle_union (&result, &rect, &result); gdk_rectangle_union (&result, &rect, &result);
} }
changed = screen->root_window->width != result.width ||
screen->root_window->height != result.height;
screen->root_window->width = result.width; screen->root_window->width = result.width;
screen->root_window->height = result.height; screen->root_window->height = result.height;
root_impl = GDK_WINDOW_IMPL_WIN32 (screen->root_window->impl); root_impl = GDK_WINDOW_IMPL_WIN32 (screen->root_window->impl);
root_impl->unscaled_width = result.width * root_impl->window_scale; root_impl->unscaled_width = result.width * root_impl->window_scale;
root_impl->unscaled_height = result.height * root_impl->window_scale; root_impl->unscaled_height = result.height * root_impl->window_scale;
return changed;
} }
static gboolean static void
init_root_window (GdkWin32Screen *screen_win32) init_root_window (GdkWin32Screen *screen_win32)
{ {
GdkScreen *screen; GdkScreen *screen;
GdkWindow *window; GdkWindow *window;
GdkWindowImplWin32 *impl_win32; GdkWindowImplWin32 *impl_win32;
gboolean changed;
GdkWin32Display *win32_display; GdkWin32Display *win32_display;
screen = GDK_SCREEN (screen_win32); screen = GDK_SCREEN (screen_win32);
@ -103,7 +97,7 @@ init_root_window (GdkWin32Screen *screen_win32)
screen_win32->root_window = window; screen_win32->root_window = window;
changed = init_root_window_size (screen_win32); init_root_window_size (screen_win32);
window->x = 0; window->x = 0;
window->y = 0; window->y = 0;
@ -127,8 +121,6 @@ init_root_window (GdkWin32Screen *screen_win32)
gdk_win32_handle_table_insert ((HANDLE *) &impl_win32->handle, window); gdk_win32_handle_table_insert ((HANDLE *) &impl_win32->handle, window);
GDK_NOTE (MISC, g_print ("screen->root_window=%p\n", window)); GDK_NOTE (MISC, g_print ("screen->root_window=%p\n", window));
return changed;
} }
static void static void
@ -148,8 +140,7 @@ _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen)
monitors_changed = _gdk_win32_display_init_monitors (GDK_WIN32_DISPLAY (_gdk_display)); monitors_changed = _gdk_win32_display_init_monitors (GDK_WIN32_DISPLAY (_gdk_display));
if (init_root_window_size (screen)) init_root_window_size (screen);
g_signal_emit_by_name (screen, "size-changed");
if (monitors_changed) if (monitors_changed)
g_signal_emit_by_name (screen, "monitors-changed"); g_signal_emit_by_name (screen, "monitors-changed");