[crawl-ref-commits] master branch updated: 0.21-a0-86-gb3e98cc

[<gi...@cr...>]

       via  b3e98cc5569973af76d871fdfdbd6a2b93bd11c3 (commit)
      from  a0cb86122693c77584186d15147a6a4da2aafefb (commit)

-----------------------------------------------------------------------
commit b3e98cc5569973af76d871fdfdbd6a2b93bd11c3
Author: advil <ra...@gm...>
Date:   Sun Jun 25 11:03:20 2017 +0200

    Ignore negative (relative) window sizes in fullscreen mode
    
    This change still lets you set the resolution exactly, but the default
    of -90,-90 (which is really for windowed mode, I believe) was causing
    weird behavior.  It also isn't clear when you'd want to set the screen
    resolution in this way, since it is hard to get a good value (some, but
    apparently not all platforms will just ignore non-standard resolutions
    anyways).

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/windowmanager-sdl.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
index 2b1cbb3..3cc891f 100644
--- a/crawl-ref/source/windowmanager-sdl.cc
+++ b/crawl-ref/source/windowmanager-sdl.cc
@@ -412,8 +412,8 @@ int SDLWrapper::init(coord_def *m_windowsz, int *densityNum, int *densityDen)
         const int x = Options.tile_window_width;
         const int y = Options.tile_window_height;
         // By default, fill the whole screen.
-        m_windowsz->x = (x > 0) ? x : _desktop_width + x;
-        m_windowsz->y = (y > 0) ? y : _desktop_height + y;
+        m_windowsz->x = (x > 0) ? x : _desktop_width;
+        m_windowsz->y = (y > 0) ? y : _desktop_height;
     }
     else
     {


-- 
Dungeon Crawl Stone Soup