Skip to content

perf(surface): skip ordering out a parking edge fin that is already hidden #1053

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

Merged
BarutSRB merged 2 commits into from
Oct 30, 2026
Merged

perf(surface): skip ordering out a parking edge fin that is already hidden #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23502a8
perf(surface): skip ordering out a parking edge fin that is already h…
dappermint Oct 30, 2026
88698a4
test(surface): check hiding a hidden fin clears dwell progress
dappermint Oct 30, 2026
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
1 change: 1 addition & 0 deletions Sources/OmniWM/Core/Surface/ParkingEdgeFin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ final class ParkingEdgeFinWindow: NSPanel {

func hide() {
finView.reset()
guard isVisible else { return }
orderOut(nil)
}

Expand Down
33 changes: 33 additions & 0 deletions Tests/OmniWMTests/ParkingEdgeMaskTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
// Copyright (C) 2026 OmniNull — https://github.com/OmniNull/OmniWM

import AppKit
@testable import OmniWM
import XCTest

Expand Down Expand Up @@ -231,6 +232,38 @@ final class ParkingEdgeMaskTests: XCTestCase {
XCTAssertFalse(SurfaceCoordinator.shared.visibleSurfaceIDs().contains(surfaceId))
}

@MainActor
func testHidingAHiddenFinDoesNotOrderItOutAgain() {
let key = ParkingEdgeMaskKey(monitorId: Monitor.ID(displayId: 95_004), side: .left)
let fin = ParkingEdgeFinWindow(key: key, onHoverChange: {}, onActivate: {})
defer { fin.destroy() }
var orderOuts = 0
let observer = NotificationCenter.default.addObserver(
forName: NSNotification.Name("NSWindowDidOrderOffScreenAndFinishAnimatingNotification"),
object: fin,
queue: nil
) { _ in MainActor.assumeIsolated { orderOuts += 1 } }
defer { NotificationCenter.default.removeObserver(observer) }
let dwellArmed = {
fin.contentView?.layer?.sublayers?.contains { $0.animation(forKey: "parkingEdge.dwell") != nil } == true
}

fin.setProgress(duration: 1.5)
XCTAssertTrue(dwellArmed())
fin.hide()
XCTAssertFalse(dwellArmed())
XCTAssertEqual(orderOuts, 0)

let mask = CGRect(x: 91_000, y: 92_000, width: 1, height: 800)
fin.show(at: CGPoint(x: 91_000.5, y: 92_400), maskFrame: mask, animated: false)
XCTAssertTrue(fin.isVisible)
fin.hide()
XCTAssertFalse(fin.isVisible)
XCTAssertEqual(orderOuts, 1)
fin.hide()
XCTAssertEqual(orderOuts, 1)
}

private func makeTopology(first: Monitor, second: Monitor, firstIsFullscreen: Bool) -> SpaceTopology {
SpaceTopology(
displays: [
Expand Down