X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fwindow.cpp;h=073cd8d5c819311277bfeb6e0ff0444521a4eeb9;hb=787d1982dceae67b9b934a9b74e08a096c0c1830;hp=5bc9a358e2786d99e7ba7e4be1c63b6dce20afa8;hpb=f6ca714e2258f4cad433801c88264947d4c2d14c;p=libs%2Fgui.git diff --git a/source/graphics/window.cpp b/source/graphics/window.cpp index 5bc9a35..073cd8d 100644 --- a/source/graphics/window.cpp +++ b/source/graphics/window.cpp @@ -11,6 +11,7 @@ namespace Graphics { WindowOptions::WindowOptions(): x(0), y(0), + user_position(false), width(640), height(480), fullscreen(false), @@ -41,6 +42,7 @@ void Window::init() kbd_autorepeat = true; touch_input = false; resizing = false; + moving = false; priv = new Private; platform_init(); @@ -70,19 +72,31 @@ void Window::reconfigure(const WindowOptions &opts) bool fullscreen_changed = (opts.fullscreen!=options.fullscreen); if(opts.width!=options.width || opts.height!=options.height) resizing = true; + if(opts.x!=options.x || opts.y!=options.y) + moving = true; + + options = opts; if(visible) { - if(opts.fullscreen) - display.set_mode(VideoMode(opts.width, opts.height)); + if(options.fullscreen) + set_fullscreen_mode(); else if(fullscreen_changed) display.restore_mode(); } - options = opts; platform_reconfigure(fullscreen_changed); } +void Window::set_fullscreen_mode() +{ + VideoMode mode(options.width, options.height); + mode.rotation = display.get_desktop_mode().monitor->desktop_rotation; + if(mode.rotation==ROTATE_LEFT || mode.rotation==ROTATE_RIGHT) + swap(mode.width, mode.height); + display.set_mode(mode, true); +} + void Window::set_keyboard_autorepeat(bool r) { kbd_autorepeat = r; @@ -101,7 +115,7 @@ void Window::show() if(options.fullscreen) { - display.set_mode(VideoMode(options.width, options.height), true); + set_fullscreen_mode(); warp_pointer(options.width/2, options.height/2); } }