mirror of
https://github.com/coteditor/CotEditor.git
synced 2024-08-16 14:50:30 +03:00
Merge branch '4.8.7'
# Conflicts: # CHANGELOG.md # CotEditor.xcodeproj/project.pbxproj
This commit is contained in:
commit
6a3007afab
@ -38,6 +38,15 @@
|
||||
|
||||
|
||||
|
||||
4.8.7 (unreleased)
|
||||
--------------------------
|
||||
|
||||
### Fixes
|
||||
|
||||
- Fix the view layout in the Quick Action bar.
|
||||
|
||||
|
||||
|
||||
4.8.6 (655)
|
||||
--------------------------
|
||||
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user