coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-08-16 14:50:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.8.7'

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	CotEditor.xcodeproj/project.pbxproj
This commit is contained in:
1024jp 2024-06-18 22:43:23 +09:00
commit 6a3007afab
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -38,6 +38,15 @@
4.8.7 (unreleased)
--------------------------
### Fixes
- Fix the view layout in the Quick Action bar.
4.8.6 (655)
--------------------------

22
CotEditor/Sources/CommandBarView.swift
View File

@ -172,7 +172,17 @@ private struct ActionCommandView: View {
var body: some View {
Label {
HStack {
Image(systemName: self.command.kind.systemImage)
.resizable()
.aspectRatio(contentMode: .fit)
.font(.system(size: 23))
.fontWeight(.light)
.foregroundStyle(self.isSelected ? .primary : .secondary)
.frame(width: 26, height: 22, alignment: .center)
.accessibilityLabel(self.command.kind.label)
.padding(.horizontal, 4)
VStack(alignment: .leading) {
HStack(alignment: .firstTextBaseline, spacing: 4) {
ForEach(Array(self.matches.enumerated()), id: \.offset) { (offset, match) in
@ -210,16 +220,6 @@ private struct ActionCommandView: View {
.foregroundStyle(self.isSelected ? .primary : .secondary)
.layoutPriority(100)
}
} icon: {
Image(systemName: self.command.kind.systemImage)
.resizable()
.aspectRatio(contentMode: .fit)
.font(.system(size: 23))
.fontWeight(.light)
.foregroundStyle(self.isSelected ? .primary : .secondary)
.frame(width: 26, height: 22, alignment: .center)
.accessibilityLabel(self.command.kind.label)
.padding(.horizontal, 4)
}
.lineLimit(1)
.padding(.vertical, 4)