From f13c24f65429467b9d5e2eab777abe68faa3d772 Mon Sep 17 00:00:00 2001 From: Mike Fikes Date: Sun, 28 Jan 2024 13:40:10 -0500 Subject: [PATCH] Layout tweaks (#223) --- Impedance Converter/Impedance Converter/CircuitView.swift | 2 +- Impedance Converter/Impedance Converter/ContentView.swift | 8 ++++---- Impedance Converter/Impedance Converter/CursorsView.swift | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Impedance Converter/Impedance Converter/CircuitView.swift b/Impedance Converter/Impedance Converter/CircuitView.swift index d27936e..0d89f28 100644 --- a/Impedance Converter/Impedance Converter/CircuitView.swift +++ b/Impedance Converter/Impedance Converter/CircuitView.swift @@ -6,7 +6,7 @@ struct CircuitPickerView: View { var body: some View { HStack { Spacer(minLength: 15) - HStack(spacing: -10) { + HStack(spacing: -5) { Image("Series") ToggleButtonView(isOn: Binding( get: { viewModel.circuitMode == .series }, diff --git a/Impedance Converter/Impedance Converter/ContentView.swift b/Impedance Converter/Impedance Converter/ContentView.swift index 95ccc53..9a4aa60 100644 --- a/Impedance Converter/Impedance Converter/ContentView.swift +++ b/Impedance Converter/Impedance Converter/ContentView.swift @@ -133,7 +133,7 @@ struct ModePickerView: View { HStack { HStack { Spacer(minLength: 15) - VStack(spacing: -2) { + VStack(alignment: .leading, spacing: -2) { HStack(spacing: -15) { Text("Z") ToggleButtonView(isOn: Binding( @@ -145,7 +145,7 @@ struct ModePickerView: View { Text("Impedance") } Spacer() - VStack(spacing: -2) { + VStack(alignment: .leading, spacing: -2) { HStack(spacing: -15) { Text("Y") ToggleButtonView(isOn: Binding( @@ -157,7 +157,7 @@ struct ModePickerView: View { Text("Admittance") } Spacer() - VStack(spacing: -2) { + VStack(alignment: .leading, spacing: -2) { HStack(spacing: -15) { Text("Γ") ToggleButtonView(isOn: Binding( @@ -171,7 +171,7 @@ struct ModePickerView: View { Spacer() } .padding(.vertical, -10) - .frame(maxWidth: 300, maxHeight: 70) + .frame(maxWidth: 320, maxHeight: 70) SettingsButtonView() } } diff --git a/Impedance Converter/Impedance Converter/CursorsView.swift b/Impedance Converter/Impedance Converter/CursorsView.swift index 8b3659a..85788e9 100644 --- a/Impedance Converter/Impedance Converter/CursorsView.swift +++ b/Impedance Converter/Impedance Converter/CursorsView.swift @@ -54,22 +54,22 @@ struct CursorsView: View { if (showCursorControls) { HStack() { Spacer(minLength: 15) - HStack(spacing: -5) { + HStack(spacing: -3) { SmithChartIcon(type: .constantResistance) ToggleButtonView(isOn: $viewModel.constantCircleCursor) } Spacer() - HStack(spacing: -5) { + HStack(spacing: -3) { SmithChartIcon(type: .constantReactance) ToggleButtonView(isOn: $viewModel.constantArcCursor) } Spacer() - HStack(spacing: -5) { + HStack(spacing: -3) { SmithChartIcon(type: .constantMagnitude) ToggleButtonView(isOn: $viewModel.constantMagnitudeCursor) } Spacer() - HStack(spacing: -5) { + HStack(spacing: -3) { SmithChartIcon(type: .constantAngle) ToggleButtonView(isOn: $viewModel.constantAngleCursor) }