WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mac

Browse Source 
# Conflicts:
#	AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp
#	PortabilityLayer/MenuManager.cpp
This commit is contained in:
Phil Marell
2021-08-05 18:46:18 +10:00
parent f36a8da95f 82fe38dfc7
commit 83978d0397
40 changed files with 448 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PortabilityLayer/WindowManager.cpp
View File

@@ -1481,7 +1481,7 @@ namespace PortabilityLayer
logger->Printf(IGpLogDriver::Category_Information, "WindowManagerImpl: Resizing from %ix%i to %ix%i", static_cast<int>(prevWidth), static_cast<int>(prevHeight), static_cast<int>(newWidth), static_cast<int>(newHeight));
const uint32_t menuBarHeight = PortabilityLayer::MenuManager::GetInstance()->GetMenuBarHeight();
const bool menuIsTouchScreen = PortabilityLayer::MenuManager::GetInstance()->IsMenuTouchScreenStyle();
const bool menuIsTouchScreen = false; //PortabilityLayer::MenuManager::GetInstance()->IsMenuTouchScreenStyle();
for (PortabilityLayer::WindowImpl *window = m_windowStackTop; window != nullptr; window = window->GetWindowBelow())
{