Skip to content

Commit 10b2a78

Browse files
committed
style(zoom): update manual zoom region edit popover to consistently follow the colors across the app
1 parent bc4d259 commit 10b2a78

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

Reframed/Editor/RegionEditPopover.swift

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct RegionEditPopover: View {
4242

4343
var body: some View {
4444
let _ = colorScheme
45-
VStack(alignment: .leading, spacing: 0) {
45+
VStack(alignment: .leading, spacing: Layout.regionPopoverSpacing) {
4646
SectionHeader(title: "Zoom")
4747

4848
SliderRow(
@@ -57,8 +57,7 @@ struct RegionEditPopover: View {
5757
.padding(.vertical, 4)
5858

5959
Divider()
60-
.background(ReframedColors.divider)
61-
.padding(.vertical, 4)
60+
.padding(.horizontal, 12)
6261

6362
SectionHeader(title: "Transition")
6463

@@ -86,30 +85,27 @@ struct RegionEditPopover: View {
8685
.padding(.horizontal, 12)
8786
.padding(.vertical, 4)
8887

89-
Divider()
90-
.background(ReframedColors.divider)
91-
.padding(.vertical, 4)
92-
9388
Button {
9489
onRemove()
9590
} label: {
96-
HStack(spacing: 8) {
91+
HStack(spacing: 5) {
9792
Image(systemName: "trash")
98-
.font(.system(size: 11))
99-
.frame(width: 14)
93+
.font(.system(size: 12, weight: .semibold))
10094
Text("Remove")
101-
.font(.system(size: 13))
102-
Spacer()
95+
.font(.system(size: 12, weight: .semibold))
10396
}
104-
.foregroundStyle(.red.opacity(0.8))
105-
.padding(.horizontal, 12)
106-
.padding(.vertical, 5)
107-
.contentShape(Rectangle())
97+
.foregroundStyle(.white)
98+
.frame(maxWidth: .infinity)
99+
.frame(height: 32)
100+
.background(Color.red.opacity(0.8))
101+
.clipShape(RoundedRectangle(cornerRadius: 7))
108102
}
109103
.buttonStyle(.plain)
104+
.padding(.horizontal, 12)
105+
.padding(.vertical, 8)
110106
}
111107
.padding(.vertical, 8)
112-
.frame(width: 260)
108+
.frame(width: Layout.regionPopoverWidth)
113109
.popoverContainerStyle()
114110
.onChange(of: zoomLevel) { commitChanges() }
115111
.onChange(of: easeIn) { commitChanges() }

0 commit comments

Comments
 (0)