New Atlas

Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	UI/MainScreen.cpp
#	android/assets/ui_atlas.zim
#	android/assets/ui_atlas_luna.meta
#	assets/ui_atlas.zim
#	assets/ui_atlas_luna.meta
This commit is contained in:
LunaMoo committed 2021-01-20 01:52:27 +01:00
commit 4b6855cd6e
134 files changed
+2120 -499

No files matched your search

+6
View File
@@ -132,6 +132,7 @@ namespace MainWindow
static bool inFullscreenResize = false;
static bool inResizeMove = false;
static bool hasFocus = true;
static bool g_isFullscreen = false;
// gross hack
bool noFocusPause = false; // TOGGLE_PAUSE state to override pause on lost focus
@@ -355,6 +356,7 @@ namespace MainWindow
::SetMenu(hWnd, goingFullscreen ? NULL : menu);
g_Config.bFullScreen = goingFullscreen;
g_isFullscreen = goingFullscreen;
g_IgnoreWM_SIZE = false;
@@ -1069,4 +1071,8 @@ namespace MainWindow
PostMessage(hwndMain, WM_USER_TOGGLE_FULLSCREEN, fullscreen, 0);
}
bool IsFullscreen() {
return g_isFullscreen;
}
} // namespace