From 9f904000a84e56d45e98b91bd69a69194fff9528 Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 29 Mar 2022 10:11:28 +0200 Subject: [PATCH] fixed status bar branch picker width --- CodeEditModules/Modules/StatusBar/src/StatusBar.swift | 6 +++++- .../src/StatusBarItems/StatusBarBranchPicker.swift | 3 ++- .../src/StatusBarItems/StatusBarCursorLocationLabel.swift | 1 + .../StatusBar/src/StatusBarItems/StatusBarLabelButton.swift | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CodeEditModules/Modules/StatusBar/src/StatusBar.swift b/CodeEditModules/Modules/StatusBar/src/StatusBar.swift index 461d736ef2..4e76f181d7 100644 --- a/CodeEditModules/Modules/StatusBar/src/StatusBar.swift +++ b/CodeEditModules/Modules/StatusBar/src/StatusBar.swift @@ -47,7 +47,11 @@ public struct StatusBarView: View { .foregroundStyle(.bar) HStack(spacing: 15) { HStack(spacing: 5) { - StatusBarLabelButton(model: model, title: model.errorCount.formatted(), image: "xmark.octagon") + StatusBarLabelButton( + model: model, + title: model.errorCount.formatted(), + image: "xmark.octagon" + ) StatusBarLabelButton( model: model, title: model.warningCount.formatted(), diff --git a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift index c68134d79f..115079b447 100644 --- a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift +++ b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift @@ -47,7 +47,8 @@ internal struct StatusBarBranchPicker: View { .font(model.toolbarFont) } .menuStyle(.borderlessButton) - .fixedSize(horizontal: false, vertical: true) + .frame(maxWidth: 150) + .fixedSize(horizontal: true, vertical: true) .onHover { isHovering($0) } .disabled(model.selectedBranch == nil) } diff --git a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarCursorLocationLabel.swift b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarCursorLocationLabel.swift index 9105fa6291..e9fb607dcf 100644 --- a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarCursorLocationLabel.swift +++ b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarCursorLocationLabel.swift @@ -20,6 +20,7 @@ internal struct StatusBarCursorLocationLabel: View { Text("Ln \(model.currentLine), Col \(model.currentCol)") .font(model.toolbarFont) .foregroundStyle(.primary) + .fixedSize() .lineLimit(1) .onHover { isHovering($0) } } diff --git a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarLabelButton.swift b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarLabelButton.swift index 881bc7d5dc..4f20359d22 100644 --- a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarLabelButton.swift +++ b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarLabelButton.swift @@ -34,6 +34,7 @@ internal struct StatusBarLabelButton: View { } .buttonStyle(.borderless) .foregroundStyle(.primary) + .fixedSize() .onHover { isHovering($0) } }