]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
Fix mouse capture in full window mode.
authorToni Wilen <twilen@winuae.net>
Tue, 15 May 2018 17:22:09 +0000 (20:22 +0300)
committerToni Wilen <twilen@winuae.net>
Tue, 15 May 2018 17:22:09 +0000 (20:22 +0300)
od-win32/win32.cpp

index eb0ba3c5e95d5215c47c93e3b612e3eb4e268e9a..f814c218f25970ad4106c9de4dd80c83d78425b0 100644 (file)
@@ -1115,7 +1115,7 @@ static void winuae_active(struct AmigaMonitor *mon, HWND hwnd, int minimized)
        getcapslock ();
        wait_keyrelease ();
        inputdevice_acquire (TRUE);
-       if (isfullscreen () != 0 && !gui_active)
+       if (isfullscreen () > 0 && !gui_active)
                setmouseactive(mon->monitor_id, 1);
 #ifdef LOGITECHLCD
        if (!minimized)
@@ -2432,6 +2432,8 @@ static int canstretch(struct AmigaMonitor *mon)
        if (isfullscreen () != 0)
                return 0;
        if (!WIN32GFX_IsPicassoScreen(mon)) {
+               if (!currprefs.gfx_windowed_resize)
+                       return 0;
                if (currprefs.gf[APMODE_NATIVE].gfx_filter_autoscale == AUTOSCALE_RESIZE)
                        return 0;
                return 1;