cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

layout/windowTarget: don't use swar on maximized (#13501)

Browse source
This commit is contained in:
Vaxry 2026-03-02 16:54:33 +00:00 • committed by GitHub
parent 9f98f7440b
commit 5f650f8ed9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hyprtester/src/tests/main/layout.cpp
View file

@ -28,6 +28,15 @@ static void swar() {
EXPECT_CONTAINS(str, "size: 1036,1036"); EXPECT_CONTAINS(str, "size: 1036,1036");
} }
// don't use swar on maximized
OK(getFromSocket("/dispatch fullscreen 1"));
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "at: 22,22");
EXPECT_CONTAINS(str, "size: 1876,1036");
}
// clean up // clean up
NLog::log("{}Killing all windows", Colors::YELLOW); NLog::log("{}Killing all windows", Colors::YELLOW);
Tests::killAllWindows(); Tests::killAllWindows();

4
src/layout/target/WindowTarget.cpp
View file

@ -110,7 +110,7 @@ void CWindowTarget::updatePos() {
Vector2D ratioPadding; Vector2D ratioPadding;
if ((*REQUESTEDRATIO).y != 0 && m_space->algorithm()->tiledTargets() <= 1) { if ((*REQUESTEDRATIO).y != 0 && m_space->algorithm()->tiledTargets() <= 1 && fullscreenMode() == FSMODE_NONE) {
const Vector2D originalSize = MONITOR_WORKAREA.size(); const Vector2D originalSize = MONITOR_WORKAREA.size();
const double requestedRatio = (*REQUESTEDRATIO).x / (*REQUESTEDRATIO).y; const double requestedRatio = (*REQUESTEDRATIO).x / (*REQUESTEDRATIO).y;
@ -137,7 +137,7 @@ void CWindowTarget::updatePos() {
calcPos = calcPos + GAPOFFSETTOPLEFT + ratioPadding / 2; calcPos = calcPos + GAPOFFSETTOPLEFT + ratioPadding / 2;
calcSize = calcSize - GAPOFFSETTOPLEFT - GAPOFFSETBOTTOMRIGHT - ratioPadding; calcSize = calcSize - GAPOFFSETTOPLEFT - GAPOFFSETBOTTOMRIGHT - ratioPadding;
if (isPseudo()) { if (isPseudo() && fullscreenMode() == FSMODE_NONE) {
// Calculate pseudo // Calculate pseudo
float scale = 1; float scale = 1;