Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
24 changes: 24 additions & 0 deletions GhosttyTabs.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

119 changes: 119 additions & 0 deletions Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -85123,6 +85123,125 @@
}
}
},
"shortcut.equalizeSplits.label": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Equalize Splits"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "分割を均等にする"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "均分面板"
}
},
"zh-Hant": {
"stringUnit": {
"state": "translated",
"value": "均等分割"
}
},
"ko": {
"stringUnit": {
"state": "translated",
"value": "분할 균등화"
}
},
"de": {
"stringUnit": {
"state": "translated",
"value": "Teilungen angleichen"
}
},
"es": {
"stringUnit": {
"state": "translated",
"value": "Igualar divisiones"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Égaliser les divisions"
}
},
"it": {
"stringUnit": {
"state": "translated",
"value": "Equalizza divisioni"
}
},
"da": {
"stringUnit": {
"state": "translated",
"value": "Udlign opdelinger"
}
},
"pl": {
"stringUnit": {
"state": "translated",
"value": "Wyrównaj podziały"
}
},
"ru": {
"stringUnit": {
"state": "translated",
"value": "Выровнять разделение"
}
},
"bs": {
"stringUnit": {
"state": "translated",
"value": "Izjednači podjele"
}
},
"ar": {
"stringUnit": {
"state": "translated",
"value": "تسوية التقسيمات"
}
},
"nb": {
"stringUnit": {
"state": "translated",
"value": "Gjør delinger like"
}
},
"pt-BR": {
"stringUnit": {
"state": "translated",
"value": "Equalizar Divisões"
}
},
"th": {
"stringUnit": {
"state": "translated",
"value": "ปรับขนาดช่องแยกให้เท่ากัน"
}
},
"tr": {
"stringUnit": {
"state": "translated",
"value": "Bölmeleri Eşitle"
}
},
"uk": {
"stringUnit": {
"state": "translated",
"value": "Вирівняти розділення"
}
}
}
},
"shortcut.splitRight.label": {
"extractionState": "manual",
"localizations": {
Expand Down
7 changes: 7 additions & 0 deletions Sources/AppDelegate+EqualizeSplitsShortcut.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
extension AppDelegate {
func performEqualizeSplitsShortcut() {
if let workspace = tabManager?.selectedWorkspace {
_ = tabManager?.equalizeSplits(tabId: workspace.id)
}
}
}
2 changes: 1 addition & 1 deletion Sources/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11256,7 +11256,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
#endif
return true
}

if matchConfiguredShortcut(event: event, action: .equalizeSplits) { performEqualizeSplitsShortcut(); return true }
// Configured split actions.
if matchConfiguredShortcut(event: event, action: .splitRight) {
#if DEBUG
Expand Down
2 changes: 2 additions & 0 deletions Sources/ContentView+RightSidebarCommandPalette.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ extension ContentView {
return .useSelectionForFind
case "palette.toggleSplitZoom":
return .toggleSplitZoom
case "palette.equalizeSplits":
return .equalizeSplits
case "palette.triggerFlash":
return .triggerFlash
default:
Expand Down
6 changes: 2 additions & 4 deletions Sources/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8223,10 +8223,8 @@ struct ContentView: View {
}
}
registry.register(commandId: "palette.equalizeSplits") {
guard let workspace = tabManager.selectedWorkspace,
tabManager.equalizeSplits(tabId: workspace.id) else {
NSSound.beep()
return
if let workspace = tabManager.selectedWorkspace {
_ = tabManager.equalizeSplits(tabId: workspace.id)
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}

Expand Down
12 changes: 6 additions & 6 deletions Sources/KeyboardShortcutSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ enum KeyboardShortcutSettings {
case focusUp
case focusDown
case splitRight
case splitDown
case toggleSplitZoom
case splitDown, toggleSplitZoom
case equalizeSplits
case splitBrowserRight
case splitBrowserDown

Expand Down Expand Up @@ -155,6 +155,7 @@ enum KeyboardShortcutSettings {
case .splitRight: return String(localized: "shortcut.splitRight.label", defaultValue: "Split Right")
case .splitDown: return String(localized: "shortcut.splitDown.label", defaultValue: "Split Down")
case .toggleSplitZoom: return String(localized: "shortcut.togglePaneZoom.label", defaultValue: "Toggle Pane Zoom")
case .equalizeSplits: return String(localized: "shortcut.equalizeSplits.label", defaultValue: "Equalize Splits")
Comment thread
austinywang marked this conversation as resolved.
Resolved
case .splitBrowserRight: return String(localized: "shortcut.splitBrowserRight.label", defaultValue: "Split Browser Right")
case .splitBrowserDown: return String(localized: "shortcut.splitBrowserDown.label", defaultValue: "Split Browser Down")
case .toggleFileExplorer: return String(localized: "shortcut.toggleFileExplorer.label", defaultValue: "Toggle File Explorer")
Expand Down Expand Up @@ -275,10 +276,9 @@ enum KeyboardShortcutSettings {
return StoredShortcut(key: "↓", command: true, shift: false, option: true, control: false)
case .splitRight:
return StoredShortcut(key: "d", command: true, shift: false, option: false, control: false)
case .splitDown:
return StoredShortcut(key: "d", command: true, shift: true, option: false, control: false)
case .toggleSplitZoom:
return StoredShortcut(key: "\r", command: true, shift: true, option: false, control: false)
case .splitDown: return StoredShortcut(key: "d", command: true, shift: true, option: false, control: false)
case .toggleSplitZoom: return StoredShortcut(key: "\r", command: true, shift: true, option: false, control: false)
case .equalizeSplits: return StoredShortcut(key: "=", command: true, shift: false, option: false, control: true)
case .splitBrowserRight:
return StoredShortcut(key: "d", command: true, shift: false, option: true, control: false)
case .splitBrowserDown:
Expand Down
81 changes: 81 additions & 0 deletions Sources/TabManager+EqualizeSplits.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import Bonsplit
import CoreGraphics
import Foundation

extension TabManager {
/// Equalize splits - not directly supported by bonsplit.
func equalizeSplits(tabId: UUID) -> Bool {
guard let tab = tabs.first(where: { $0.id == tabId }) else { return false }

let didEqualize = equalizeSplitsOnce(in: tab)
if didEqualize {
tab.didProgrammaticallyChangeSplitGeometry()
scheduleEqualizeSplitsFollowUp(tabId: tabId)
}
return didEqualize
Comment thread
austinywang marked this conversation as resolved.
Resolved
}

@discardableResult
private func equalizeSplitsOnce(in tab: Workspace) -> Bool {
var foundSplit = false
var allSucceeded = true
equalizeSplits(
in: tab.bonsplitController.treeSnapshot(),
controller: tab.bonsplitController,
foundSplit: &foundSplit,
allSucceeded: &allSucceeded
)
return foundSplit && allSucceeded
}

private func scheduleEqualizeSplitsFollowUp(tabId: UUID) {
DispatchQueue.main.async { [weak self] in
self?.runEqualizeSplitsFollowUp(tabId: tabId)
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) { [weak self] in
self?.runEqualizeSplitsFollowUp(tabId: tabId)
}
}

private func runEqualizeSplitsFollowUp(tabId: UUID) {
guard let tab = tabs.first(where: { $0.id == tabId }) else { return }
if equalizeSplitsOnce(in: tab) {
tab.didProgrammaticallyChangeSplitGeometry()
}
}

private func equalizeSplits(
in node: ExternalTreeNode,
controller: BonsplitController,
foundSplit: inout Bool,
allSucceeded: inout Bool
) {
switch node {
case .pane:
return
case .split(let splitNode):
foundSplit = true
guard let splitId = UUID(uuidString: splitNode.id) else {
allSucceeded = false
return
}

if !controller.setDividerPosition(0.5, forSplit: splitId) {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
allSucceeded = false
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

equalizeSplits(
in: splitNode.first,
controller: controller,
foundSplit: &foundSplit,
allSucceeded: &allSucceeded
)
equalizeSplits(
in: splitNode.second,
controller: controller,
foundSplit: &foundSplit,
allSucceeded: &allSucceeded
)
}
}
}
50 changes: 0 additions & 50 deletions Sources/TabManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5508,21 +5508,6 @@ class TabManager: ObservableObject {
return tab.bonsplitController.setDividerPosition(clamped, forSplit: candidate.splitId, fromExternal: true)
}

/// Equalize splits - not directly supported by bonsplit
func equalizeSplits(tabId: UUID) -> Bool {
guard let tab = tabs.first(where: { $0.id == tabId }) else { return false }

var foundSplit = false
var allSucceeded = true
equalizeSplits(
in: tab.bonsplitController.treeSnapshot(),
controller: tab.bonsplitController,
foundSplit: &foundSplit,
allSucceeded: &allSucceeded
)
return foundSplit && allSucceeded
}

/// Toggle zoom on a panel.
func toggleSplitZoom(tabId: UUID, surfaceId: UUID) -> Bool {
guard let tab = tabs.first(where: { $0.id == tabId }) else { return false }
Expand All @@ -5537,41 +5522,6 @@ class TabManager: ObservableObject {
return tab.toggleSplitZoom(panelId: focusedPanelId)
}

private func equalizeSplits(
in node: ExternalTreeNode,
controller: BonsplitController,
foundSplit: inout Bool,
allSucceeded: inout Bool
) {
switch node {
case .pane:
return
case .split(let splitNode):
foundSplit = true
guard let splitId = UUID(uuidString: splitNode.id) else {
allSucceeded = false
return
}

if !controller.setDividerPosition(0.5, forSplit: splitId) {
allSucceeded = false
}

equalizeSplits(
in: splitNode.first,
controller: controller,
foundSplit: &foundSplit,
allSucceeded: &allSucceeded
)
equalizeSplits(
in: splitNode.second,
controller: controller,
foundSplit: &foundSplit,
allSucceeded: &allSucceeded
)
}
}

private struct ResizeSplitCandidate {
let splitId: UUID
let orientation: String
Expand Down
6 changes: 6 additions & 0 deletions Sources/Workspace+EqualizeSplitsSupport.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extension Workspace {
func didProgrammaticallyChangeSplitGeometry() {
tmuxLayoutSnapshot = bonsplitController.layoutSnapshot()
scheduleTerminalGeometryReconcile()
}
}
4 changes: 2 additions & 2 deletions Sources/Workspace.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7201,7 +7201,7 @@ final class Workspace: Identifiable, ObservableObject {
@Published private(set) var panelCustomTitles: [UUID: String] = [:]
@Published private(set) var pinnedPanelIds: Set<UUID> = []
@Published private(set) var manualUnreadPanelIds: Set<UUID> = []
@Published private(set) var tmuxLayoutSnapshot: LayoutSnapshot?
@Published var tmuxLayoutSnapshot: LayoutSnapshot?
Comment thread
austinywang marked this conversation as resolved.
Resolved
@Published private(set) var tmuxWorkspaceFlashPanelId: UUID?
@Published private(set) var tmuxWorkspaceFlashReason: WorkspaceAttentionFlashReason?
@Published private(set) var tmuxWorkspaceFlashToken: UInt64 = 0
Expand Down Expand Up @@ -12107,7 +12107,7 @@ final class Workspace: Identifiable, ObservableObject {
return needsFollowUpPass
}

private func scheduleTerminalGeometryReconcile() {
func scheduleTerminalGeometryReconcile() {
beginEventDrivenLayoutFollowUp(
reason: "workspace.geometry",
includeGeometry: true
Expand Down
11 changes: 11 additions & 0 deletions Sources/cmuxApp+EqualizeSplitsMenu.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import SwiftUI

extension cmuxApp {
func equalizeSplitsCommandButton() -> some View {
splitCommandButton(title: String(localized: "command.equalizeSplits.title", defaultValue: "Equalize Splits"), shortcut: menuShortcut(for: .equalizeSplits)) {
if let workspace = activeTabManager.selectedWorkspace {
_ = activeTabManager.equalizeSplits(tabId: workspace.id)
}
}
}
}
Loading