diff options
| author | Pablo Barciela <[email protected]> | 2017-12-04 01:01:52 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-12-16 20:04:18 +0100 |
| commit | 2fea2c846689d3810def93e6e0e6eeb01c2ef718 (patch) | |
| tree | 3ec5bb043842bbc5e6e9e504a4b4adc2ef22aecf /src/caja-window.c | |
| parent | c6b81f64c4c4212e414c04e584380774d6ac83ca (diff) | |
| download | caja-2fea2c846689d3810def93e6e0e6eeb01c2ef718.tar.bz2 caja-2fea2c846689d3810def93e6e0e6eeb01c2ef718.tar.xz | |
WidthOfScreen and HeightOfScreen implementation
This commit reverts:
https://github.com/mate-desktop/caja/commit/4c130e22b98bbc1a85747adac3b582e45d34514e
https://github.com/mate-desktop/caja/commit/ac12e6d16f4a51b3327d013781e72cfec17f3624
https://github.com/mate-desktop/caja/commit/17b3c0ca924ffcd4bd06fded98227eba626d4f0b
https://github.com/mate-desktop/caja/commit/42c8d2c3373c25d6e321be6950997c0d7ce44279
And it applies an alternative to fix the deprecated functions:
gdk_screen_get_width
gdk_screen_get_height
gdk_screen_width
gdk_screen_height
Diffstat (limited to 'src/caja-window.c')
| -rw-r--r-- | src/caja-window.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/caja-window.c b/src/caja-window.c index f820a20b..10e71b35 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -516,12 +516,7 @@ caja_window_zoom_to_default (CajaWindow *window) static guint get_max_forced_height (GdkScreen *screen) { - gint height; - - gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL, - NULL, &height); - - return (height * 90) / 100; + return (HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) * 90) / 100; } /* Code should never force the window wider than this size. @@ -530,12 +525,7 @@ get_max_forced_height (GdkScreen *screen) static guint get_max_forced_width (GdkScreen *screen) { - gint width; - - gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL, - &width, NULL); - - return (width * 90) / 100; + return (WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) * 90) / 100; } /* This must be called when construction of CajaWindow is finished, |