Skip to content

Allow smaller to shrink the height of a vertically maximized window #1807

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

Open
YuriNachos wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

Allow smaller to shrink the height of a vertically maximized window #1807

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
2 changes: 1 addition & 1 deletion Rectangle/WindowCalculation/ChangeSizeCalculation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ChangeSizeCalculation: WindowCalculation, ChangeWindowDimensionCalculation
resizedWindowRect.size.height = resizedWindowRect.height + sizeOffset
resizedWindowRect.origin.y = resizedWindowRect.minY - floor(sizeOffset / 2.0)

if curtainChangeSize, params.action != .smallerHeight {
if curtainChangeSize, ![.smaller, .smallerHeight].contains(params.action) {
resizedWindowRect = againstTopAndBottomScreenEdges(
originalWindowRect: window.rect,
resizedWindowRect: resizedWindowRect,
Expand Down
16 changes: 13 additions & 3 deletions RectangleTests/RectangleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class ChangeSizeCalculationTests: XCTestCase {

func testExplicitZeroDisablesScreenFractionMinimum() {
XCTAssertEqual(smallerResult(for: issueWindowRect),
CGRect(x: 1925, y: 0, width: 635, height: 1415))
CGRect(x: 1925, y: 15, width: 635, height: 1385))
}

func testDoubleDefaultDistinguishesAbsentFromExplicitZero() {
Expand Down Expand Up @@ -380,7 +380,7 @@ class ChangeSizeCalculationTests: XCTestCase {
let windowRect = CGRect(x: 1890, y: 0, width: 670, height: 1415)

XCTAssertEqual(smallerResult(for: windowRect),
CGRect(x: 1920, y: 0, width: 640, height: 1415))
CGRect(x: 1920, y: 15, width: 640, height: 1385))
}

func testSmallerHonorsConfiguredScreenFractionMinimum() {
Expand All @@ -389,11 +389,21 @@ class ChangeSizeCalculationTests: XCTestCase {
XCTAssertEqual(smallerResult(for: issueWindowRect), issueWindowRect)
}

func testSmallerShrinksHeightOfFullHeightWindow() {
// Regression for #1737: a vertically-maximized (Half / full-height) window must shrink in
// BOTH dimensions under the combined `.smaller` command, not only in width. Mirrors the
// `.smallerHeight` exception added in b97a353 (fixes #1645), extended to `.smaller`.
let fullHeightHalf = CGRect(x: 0, y: 0, width: 1280, height: 1415)

XCTAssertEqual(smallerResult(for: fullHeightHalf),
CGRect(x: 0, y: 15, width: 1250, height: 1385))
}

func testSmallConfiguredScreenFractionAllowsIssueRegressionStep() {
Defaults.minimumWindowWidth.value = 0.01

XCTAssertEqual(smallerResult(for: issueWindowRect),
CGRect(x: 1925, y: 0, width: 635, height: 1415))
CGRect(x: 1925, y: 15, width: 635, height: 1385))
}

func testExplicitZeroStillRejectsNonpositiveSize() {
Expand Down