Skip to content

layout/scrolling: fix inconsistent column widths at tape edges #16581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
erstarr wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −19
Draft

layout/scrolling: fix inconsistent column widths at tape edges #16581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions hyprtester/src/tests/main/scroll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ TEST_CASE(scrollWindowRule) {

// not the greatest test, but as long as res and gaps don't change, we good.
// if this test breaks, it's likely you broke equal sizing
ASSERT_CONTAINS(getFromSocket("/activewindow"), "size: 179,1036");
ASSERT_CONTAINS(getFromSocket("/activewindow"), "size: 174,1036");
}

/*
Expand Down Expand Up @@ -534,8 +534,8 @@ TEST_CASE(scroll_LAYOUT_HANDLED_TestFsingGroupedWindows) {
auto entryStart = clients.rfind("Window ", classPos);
auto entryEnd = clients.find("\n\n", classPos);
auto windowEntry = clients.substr(entryStart, entryEnd - entryStart);
EXPECT_CONTAINS(windowEntry, "size: 1915,1059");
EXPECT_CONTAINS(windowEntry, "at: 0,21");
EXPECT_CONTAINS(windowEntry, "size: 1910,1059");
EXPECT_CONTAINS(windowEntry, "at: 5,21");
}
};

Expand All @@ -562,9 +562,9 @@ TEST_CASE(scroll_LAYOUT_HANDLED_TestFsingGroupedWindows) {
auto entryStart = clients.rfind("Window ", classPos);
auto entryEnd = clients.find("\n\n", classPos);
auto windowEntry = clients.substr(entryStart, entryEnd - entryStart);
EXPECT_CONTAINS(windowEntry, "at: -940,41");
EXPECT_CONTAINS(windowEntry, "at: -935,41");
// cuz the gaps and borders workspace rule now applies as it is no longer covering
EXPECT_CONTAINS(windowEntry, "size: 1875,1019");
EXPECT_CONTAINS(windowEntry, "size: 1870,1019");
EXPECT_CONTAINS(windowEntry, "fullscreen: 0");
}
};
Expand All @@ -575,8 +575,8 @@ TEST_CASE(scroll_LAYOUT_HANDLED_TestFsingGroupedWindows) {
// check position and size for the focused group member (kitten2).
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "class: kitten2");
EXPECT_CONTAINS(str, "at: 0,21");
EXPECT_CONTAINS(str, "size: 1915,1059");
EXPECT_CONTAINS(str, "at: 5,21");
EXPECT_CONTAINS(str, "size: 1910,1059");
}
checkHiddenGroupMember_tiled("kitten1");

Expand All @@ -587,8 +587,8 @@ TEST_CASE(scroll_LAYOUT_HANDLED_TestFsingGroupedWindows) {
// check position and size for the focused group member (kitten2).
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "class: kitten1");
EXPECT_CONTAINS(str, "at: 0,21");
EXPECT_CONTAINS(str, "size: 1915,1059");
EXPECT_CONTAINS(str, "at: 5,21");
EXPECT_CONTAINS(str, "size: 1910,1059");
}
checkHiddenGroupMember_tiled("kitten2");

Expand All @@ -605,8 +605,8 @@ TEST_CASE(scroll_LAYOUT_HANDLED_TestFsingGroupedWindows) {
// check position and size for the focused group member (kitten2).
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "class: kitten2");
EXPECT_CONTAINS(str, "at: -940,41");
EXPECT_CONTAINS(str, "size: 1875,1019");
EXPECT_CONTAINS(str, "at: -935,41");
EXPECT_CONTAINS(str, "size: 1870,1019");
EXPECT_CONTAINS(str, "fullscreen: 1");
}
checkHiddenGroupMember_notCovering("kitten1");
Expand All @@ -621,8 +621,8 @@ TEST_CASE(scroll_LAYOUT_HANDLED_TestFsingGroupedWindows) {
// check position and size for the focused group member (kitten2).
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "class: kitten1");
EXPECT_CONTAINS(str, "at: -940,41");
EXPECT_CONTAINS(str, "size: 1875,1019");
EXPECT_CONTAINS(str, "at: -935,41");
EXPECT_CONTAINS(str, "size: 1870,1019");
EXPECT_CONTAINS(str, "fullscreen: 1");
}
checkHiddenGroupMember_notCovering("kitten2");
Expand Down
10 changes: 4 additions & 6 deletions src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,15 +472,13 @@ void SScrollingData::recalculate(bool forceInstant) {
CBox visual = logical;
const bool PRIMARY_HORIZ = controller->isPrimaryHorizontal();

const bool COL_NOT_LEFT = controller->isReversed() ? colIdx + 1 < columns.size() : colIdx > 0;
const bool COL_NOT_RIGHT = controller->isReversed() ? colIdx > 0 : colIdx + 1 < columns.size();
const bool TARGET_NOT_TOP = controller->isReversed() ? targetIdx + 1 < columns[colIdx]->targetDatas.size() : targetIdx > 0;
const bool TARGET_NOT_BOTTOM = controller->isReversed() ? targetIdx > 0 : targetIdx + 1 < columns[colIdx]->targetDatas.size();

const bool GAP_LEFT = PRIMARY_HORIZ ? COL_NOT_LEFT : TARGET_NOT_TOP;
const bool GAP_RIGHT = PRIMARY_HORIZ ? COL_NOT_RIGHT : TARGET_NOT_BOTTOM;
const bool GAP_TOP = PRIMARY_HORIZ ? TARGET_NOT_TOP : COL_NOT_LEFT;
const bool GAP_BOTTOM = PRIMARY_HORIZ ? TARGET_NOT_BOTTOM : COL_NOT_RIGHT;
const bool GAP_LEFT = PRIMARY_HORIZ || TARGET_NOT_TOP;
const bool GAP_RIGHT = PRIMARY_HORIZ || TARGET_NOT_BOTTOM;
const bool GAP_TOP = !PRIMARY_HORIZ || TARGET_NOT_TOP;
const bool GAP_BOTTOM = !PRIMARY_HORIZ || TARGET_NOT_BOTTOM;

const auto GAPOFFSETTOPLEFT = Vector2D(sc<double>(GAP_LEFT ? GAPSIN.m_left : 0), sc<double>(GAP_TOP ? GAPSIN.m_top : 0));
const auto GAPOFFSETBOTTOMRIGHT = Vector2D(sc<double>(GAP_RIGHT ? GAPSIN.m_right : 0), sc<double>(GAP_BOTTOM ? GAPSIN.m_bottom : 0));
Expand Down
Loading