gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

WidthOfScreen and HeightOfScreen implementation 

This commit reverts:

5c6f10892a

And it applies an alternative to fix the deprecated functions:

gdk_screen_get_width
gdk_screen_get_height
master-1.22
Pablo Barciela 2017-12-09 01:45:56 +01:00
parent 947e9aec19
commit 926ec59919
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/terminal-window.c
View File

@ -2798,7 +2798,6 @@ terminal_window_update_size_set_geometry (TerminalWindow *window,
unsigned int force_grid_width = 0, force_grid_height = 0; unsigned int force_grid_width = 0, force_grid_height = 0;
int grid_width, grid_height; int grid_width, grid_height;
gint pixel_width, pixel_height; gint pixel_width, pixel_height;
gint sc_width, sc_height;
GdkWindow *gdk_window; GdkWindow *gdk_window;
GdkGravity pos_gravity; GdkGravity pos_gravity;
@ -2874,16 +2873,14 @@ terminal_window_update_size_set_geometry (TerminalWindow *window,
if ((geom_result & YValue) == 0) if ((geom_result & YValue) == 0)
force_pos_y = 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 || if (pos_gravity == GDK_GRAVITY_SOUTH_EAST ||
pos_gravity == GDK_GRAVITY_NORTH_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 || if (pos_gravity == GDK_GRAVITY_SOUTH_WEST ||
pos_gravity == GDK_GRAVITY_SOUTH_EAST) 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 /* 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. * prefer to be able to, but it's kind of a bogus thing to do.