diff options
| author | Pablo Barciela <[email protected]> | 2017-12-09 01:45:56 +0100 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2017-12-09 01:51:04 +0100 |
| commit | 926ec59919a2416a09e95a7a69494187081082cc (patch) | |
| tree | 200d3274d30da4d625e367ab93bb7bd52346df03 | |
| parent | 947e9aec1945a3da44efbb96c06b50803ef16951 (diff) | |
| download | mate-terminal-926ec59919a2416a09e95a7a69494187081082cc.tar.bz2 mate-terminal-926ec59919a2416a09e95a7a69494187081082cc.tar.xz | |
WidthOfScreen and HeightOfScreen implementation
This commit reverts:
https://github.com/mate-desktop/mate-terminal/commit/5c6f10892aed32bf7c450962119f65c470898d6d
And it applies an alternative to fix the deprecated functions:
gdk_screen_get_width
gdk_screen_get_height
| -rw-r--r-- | src/terminal-window.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/terminal-window.c b/src/terminal-window.c index 84fc65b..26655cb 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -2798,7 +2798,6 @@ terminal_window_update_size_set_geometry (TerminalWindow *window, unsigned int force_grid_width = 0, force_grid_height = 0; int grid_width, grid_height; gint pixel_width, pixel_height; - gint sc_width, sc_height; GdkWindow *gdk_window; GdkGravity pos_gravity; @@ -2874,16 +2873,14 @@ terminal_window_update_size_set_geometry (TerminalWindow *window, if ((geom_result & YValue) == 0) force_pos_y = 0; - gdk_window_get_geometry (gdk_screen_get_root_window (gtk_widget_get_screen (app)), - NULL, NULL, &sc_width, &sc_height); - if (pos_gravity == GDK_GRAVITY_SOUTH_EAST || pos_gravity == GDK_GRAVITY_NORTH_EAST) - force_pos_x = sc_width - pixel_width + force_pos_x; - + force_pos_x = WidthOfScreen (gdk_x11_screen_get_xscreen (gtk_widget_get_screen (app))) - + pixel_width + force_pos_x; if (pos_gravity == GDK_GRAVITY_SOUTH_WEST || pos_gravity == GDK_GRAVITY_SOUTH_EAST) - force_pos_y = sc_height - pixel_height + force_pos_y; + force_pos_y = HeightOfScreen (gdk_x11_screen_get_xscreen (gtk_widget_get_screen (app))) - + pixel_height + force_pos_y; /* we don't let you put a window offscreen; maybe some people would * prefer to be able to, but it's kind of a bogus thing to do. |