Skip to content

Commit 192a8ce

Browse files
committed
Adjust orders of editor keyboard toolbar items
1 parent 5958c03 commit 192a8ce

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

CodeApp/Views/TerminalKeyboardToolbar.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,6 @@ struct TerminalKeyboardToolBar: View {
109109
var body: some View {
110110
HStack(spacing: horizontalSizeClass == .compact ? 8 : 14) {
111111
Group {
112-
if UIPasteboard.general.hasStrings || pasteBoardHasContent {
113-
Button(
114-
action: {
115-
if let string = UIPasteboard.general.string {
116-
typeAndResetModifiers(text: string)
117-
}
118-
},
119-
label: {
120-
Image(systemName: "doc.on.clipboard")
121-
})
122-
}
123112
Button(
124113
action: {
125114
typeAndResetModifiers(text: "\u{1b}")
@@ -134,15 +123,15 @@ struct TerminalKeyboardToolBar: View {
134123
typeAndResetModifiers(text: "\t")
135124
},
136125
label: {
137-
Text("")
126+
Text("Tab")
138127
})
139128
Button(
140129
action: {
141130
handleControlTap()
142131
},
143132
label: {
144133
Text("Ctrl")
145-
.padding(.horizontal, 4)
134+
.padding(.horizontal, 2)
146135
.background(
147136
controlActive ? Color.accentColor.opacity(0.3) : Color.clear
148137
)
@@ -162,7 +151,7 @@ struct TerminalKeyboardToolBar: View {
162151
},
163152
label: {
164153
Text("Alt")
165-
.padding(.horizontal, 4)
154+
.padding(.horizontal, 2)
166155
.background(
167156
altActive ? Color.accentColor.opacity(0.3) : Color.clear
168157
)
@@ -175,20 +164,31 @@ struct TerminalKeyboardToolBar: View {
175164
)
176165
.accessibilityLabel("Alt")
177166
.accessibilityValue(altLocked ? "Locked" : (altActive ? "Active" : "Inactive"))
167+
}
168+
169+
Spacer()
170+
171+
Group {
178172
Button(
179173
action: {
180174
typeAndResetModifiers(text: "\u{1b}[3~")
181175
},
182176
label: {
183-
Text("Del")
177+
Image(systemName: "delete.right")
184178
}
185179
)
186180
.accessibilityLabel("Delete")
187-
}
188-
189-
Spacer()
190-
191-
Group {
181+
if UIPasteboard.general.hasStrings || pasteBoardHasContent {
182+
Button(
183+
action: {
184+
if let string = UIPasteboard.general.string {
185+
typeAndResetModifiers(text: string)
186+
}
187+
},
188+
label: {
189+
Image(systemName: "doc.on.clipboard")
190+
})
191+
}
192192
Button(
193193
action: {
194194
moveCursorAndResetModifiers(codeSequence: "[A")

0 commit comments

Comments
 (0)