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

Fix broken window repositioning on mobile

Browse Source
This commit is contained in:
elasota
2020-11-01 13:47:22 -05:00
parent 96867a3ed8
commit a07b7d41e4
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PortabilityLayer/WindowManager.cpp
View File

@@ -1471,6 +1471,9 @@ namespace PortabilityLayer
int32_t currentY = window->GetPosition().m_y; int32_t currentY = window->GetPosition().m_y;
if (!menuIsTouchScreen) if (!menuIsTouchScreen)
{ {
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "currentY: %i menuBarHeight: %i", static_cast<int>(currentY), static_cast<int>(menuBarHeight));
if (currentY < static_cast<int32_t>(menuBarHeight)) if (currentY < static_cast<int32_t>(menuBarHeight))
newY = currentY; newY = currentY;
else else
@@ -1481,13 +1484,21 @@ namespace PortabilityLayer
{ {
uint32_t prevClearanceY = prevHeight - paddedHeight - menuBarHeight; uint32_t prevClearanceY = prevHeight - paddedHeight - menuBarHeight;
uint32_t newClearanceY = newHeight - paddedHeight - menuBarHeight; uint32_t newClearanceY = newHeight - paddedHeight - menuBarHeight;
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "prevClearanceY: %i newClearanceY: %i", static_cast<int>(prevClearanceY), static_cast<int>(newClearanceY));
newY = (static_cast<int64_t>(currentY) - static_cast<int64_t>(menuBarHeight) - chromePadding[WindowChromeSides::kTop]) * static_cast<int64_t>(newClearanceY) / static_cast<int64_t>(prevClearanceY) + menuBarHeight + chromePadding[WindowChromeSides::kTop]; newY = (static_cast<int64_t>(currentY) - static_cast<int64_t>(menuBarHeight) - chromePadding[WindowChromeSides::kTop]) * static_cast<int64_t>(newClearanceY) / static_cast<int64_t>(prevClearanceY) + menuBarHeight + chromePadding[WindowChromeSides::kTop];
} }
} }
} }
else else
{ {
uint32_t heightWithoutMenu = surfaceRect.Height() - menuBarHeight; uint32_t heightWithoutMenu = std::max<uint32_t>(prevHeight, menuBarHeight) - menuBarHeight;
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "currentY: %i paddedHeight: %i heightWithoutMenu: %i", static_cast<int>(currentY), static_cast<int>(paddedHeight), static_cast<int>(heightWithoutMenu));
if (currentY + static_cast<int32_t>(paddedHeight) >= static_cast<int32_t>(heightWithoutMenu)) if (currentY + static_cast<int32_t>(paddedHeight) >= static_cast<int32_t>(heightWithoutMenu))
newY = currentY; newY = currentY;
else else
@@ -1498,6 +1509,10 @@ namespace PortabilityLayer
{ {
uint32_t prevClearanceY = prevHeight - paddedHeight - menuBarHeight; uint32_t prevClearanceY = prevHeight - paddedHeight - menuBarHeight;
uint32_t newClearanceY = newHeight - paddedHeight - menuBarHeight; uint32_t newClearanceY = newHeight - paddedHeight - menuBarHeight;
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "prevClearanceY: %i newClearanceY: %i", static_cast<int>(prevClearanceY), static_cast<int>(newClearanceY));
newY = (static_cast<int64_t>(currentY) - static_cast<int64_t>(menuBarHeight) - chromePadding[WindowChromeSides::kTop]) * static_cast<int64_t>(newClearanceY) / static_cast<int64_t>(prevClearanceY) + chromePadding[WindowChromeSides::kTop]; newY = (static_cast<int64_t>(currentY) - static_cast<int64_t>(menuBarHeight) - chromePadding[WindowChromeSides::kTop]) * static_cast<int64_t>(newClearanceY) / static_cast<int64_t>(prevClearanceY) + chromePadding[WindowChromeSides::kTop];
} }
} }