From 9dcdd5de41af67c420d4fb517c6b0ba044f94759 Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Thu, 3 Jul 2025 19:32:27 +0100 Subject: [PATCH] fixed wierd border issues --- ShhShell/Views/Themes/AnsiPickerView.swift | 40 ++++++++++---------- ShhShell/Views/Themes/ThemeManagerView.swift | 2 +- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/ShhShell/Views/Themes/AnsiPickerView.swift b/ShhShell/Views/Themes/AnsiPickerView.swift index c52ce1f..c1b46b4 100644 --- a/ShhShell/Views/Themes/AnsiPickerView.swift +++ b/ShhShell/Views/Themes/AnsiPickerView.swift @@ -14,32 +14,30 @@ struct AnsiPickerView: View { ZStack(alignment: .center) { RoundedRectangle(cornerRadius: 15) .foregroundStyle(hostsManager.selectedTheme.foreground.suiColor.opacity(0.5)) - GeometryReader { geo in - VStack(spacing: 0) { - ForEach(0...1, id: \.self) { row in - HStack(spacing: 0) { - ForEach(1...8, id: \.self) { col in - let index = (col+(row*8))-1 - var isSelected: Bool { hostsManager.selectedAnsi == index } - ZStack { - Rectangle() - .fill(hostsManager.selectedTheme.background.suiColor) - RoundedRectangle(cornerRadius: isSelected ? 5 : 0) - .fill(hostsManager.selectedTheme.ansi[index].suiColor) - .padding(isSelected ? 5 : 0) - .onTapGesture { - hostsManager.selectAnsi(index) - } - } - .frame(minWidth: 20, minHeight: 20) - .aspectRatio(1, contentMode: .fit) + VStack(spacing: 0) { + ForEach(0...1, id: \.self) { row in + HStack(spacing: 0) { + ForEach(1...8, id: \.self) { col in + let index = (col+(row*8))-1 + var isSelected: Bool { hostsManager.selectedAnsi == index } + ZStack { + Rectangle() + .fill(hostsManager.selectedTheme.background.suiColor) + RoundedRectangle(cornerRadius: isSelected ? 5 : 0) + .fill(hostsManager.selectedTheme.ansi[index].suiColor) + .padding(isSelected ? 5 : 0) + .onTapGesture { + hostsManager.selectAnsi(index) + } } + .frame(minWidth: 20, minHeight: 20) + .aspectRatio(1, contentMode: .fit) } } } - .aspectRatio(4, contentMode: .fit) - .clipShape(RoundedRectangle(cornerRadius: 10)) } + .aspectRatio(4, contentMode: .fit) + .clipShape(RoundedRectangle(cornerRadius: 10)) .padding(5) } } diff --git a/ShhShell/Views/Themes/ThemeManagerView.swift b/ShhShell/Views/Themes/ThemeManagerView.swift index d92629b..8b0bbea 100644 --- a/ShhShell/Views/Themes/ThemeManagerView.swift +++ b/ShhShell/Views/Themes/ThemeManagerView.swift @@ -46,7 +46,7 @@ struct ThemeManagerView: View { } HStack { AnsiPickerView(hostsManager: hostsManager) - .frame(width: 400, height: 100) +// .frame(width: 400, height: 100) Spacer() } .padding(.horizontal)