From 8a66c368cd05d52825317ad4e561bf449985cac3 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Mon, 13 Jul 2020 22:51:09 +0800 Subject: [PATCH] fixes enum ==, changes frames --- Multiplatform/macOS/Preferences/MacPreferencesView.swift | 6 +++--- .../Preference Panes/Accounts/AccountsPreferencesView.swift | 2 +- .../Accounts/Add Account/AddAccountModel.swift | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Multiplatform/macOS/Preferences/MacPreferencesView.swift b/Multiplatform/macOS/Preferences/MacPreferencesView.swift index 0e1ce4b15..e663647ad 100644 --- a/Multiplatform/macOS/Preferences/MacPreferencesView.swift +++ b/Multiplatform/macOS/Preferences/MacPreferencesView.swift @@ -40,7 +40,7 @@ struct MacPreferencesView: View { }.foregroundColor( viewModel.currentPreferencePane == .general ? Color("AccentColor") : Color.gray ) - }) + }).frame(width: 70) Button(action: { viewModel.currentPreferencePane = .accounts }, label: { @@ -51,7 +51,7 @@ struct MacPreferencesView: View { }.foregroundColor( viewModel.currentPreferencePane == .accounts ? Color("AccentColor") : Color.gray ) - }) + }).frame(width: 70) Button(action: { viewModel.currentPreferencePane = .advanced }, label: { @@ -62,7 +62,7 @@ struct MacPreferencesView: View { }.foregroundColor( viewModel.currentPreferencePane == .advanced ? Color("AccentColor") : Color.gray ) - }) + }).frame(width: 70) } } } diff --git a/Multiplatform/macOS/Preferences/Preference Panes/Accounts/AccountsPreferencesView.swift b/Multiplatform/macOS/Preferences/Preference Panes/Accounts/AccountsPreferencesView.swift index 26f83114e..fe9284bcb 100644 --- a/Multiplatform/macOS/Preferences/Preference Panes/Accounts/AccountsPreferencesView.swift +++ b/Multiplatform/macOS/Preferences/Preference Panes/Accounts/AccountsPreferencesView.swift @@ -103,7 +103,7 @@ struct ConfiguredAccountRow: View { if let img = account.smallIcon?.image { Image(rsImage: img) .resizable() - .frame(width: 30, height: 30) + .frame(width: 20, height: 20) .aspectRatio(contentMode: .fit) } Text(account.nameForDisplay) diff --git a/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Add Account/AddAccountModel.swift b/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Add Account/AddAccountModel.swift index 5c718db4a..515da26e0 100644 --- a/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Add Account/AddAccountModel.swift +++ b/Multiplatform/macOS/Preferences/Preference Panes/Accounts/Add Account/AddAccountModel.swift @@ -38,7 +38,7 @@ class AddAccountModel: ObservableObject { case (.other(let lhsError), .other(let rhsError)): return lhsError.localizedDescription == rhsError.localizedDescription default: - return lhs == rhs + return false } } }