avoid deprecated gdk_screen_get_width/height
parent
67e749f9a2
commit
5c6f10892a
|
@ -2776,6 +2776,7 @@ 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;
|
||||||
|
|
||||||
|
@ -2851,14 +2852,16 @@ 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 = gdk_screen_get_width (gtk_widget_get_screen (app)) -
|
force_pos_x = sc_width - pixel_width + force_pos_x;
|
||||||
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 = gdk_screen_get_height (gtk_widget_get_screen (app)) -
|
force_pos_y = sc_height - pixel_height + force_pos_y;
|
||||||
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.
|
||||||
|
|
Loading…
Reference in New Issue