From be672201558d65b29bf629a3cd4b44c8a4dec3f6 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 16 Dec 2022 15:04:12 +0800 Subject: [PATCH] TDKCandidates // Weaken the window border color. --- .../VwrCandidateTDK/VwrCandidateHorizontal.swift | 4 +++- .../TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift | 4 +++- .../VwrCandidateHorizontalBackports.swift | 4 +++- .../VwrCandidateVerticalBackports.swift | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift index 5f86f054..4489e2e8 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift @@ -155,7 +155,9 @@ public struct VwrCandidateHorizontal: View { .frame(minWidth: thePool.maxWindowWidth, maxWidth: thePool.maxWindowWidth) .background(Color(nsColor: NSColor.controlBackgroundColor).ignoresSafeArea()) .overlay( - RoundedRectangle(cornerRadius: 10).stroke(.white.opacity(0.2), lineWidth: 1) + RoundedRectangle(cornerRadius: 10).stroke( + Color(white: colorScheme == .dark ? 0 : 1).opacity(colorScheme == .dark ? 1 : 0.1), lineWidth: 0.5 + ) ) .cornerRadius(10) } diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift index 1b2c441a..1f6ee71d 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift @@ -161,7 +161,9 @@ public struct VwrCandidateVertical: View { } .background(Color(nsColor: NSColor.controlBackgroundColor).ignoresSafeArea()) .overlay( - RoundedRectangle(cornerRadius: 10).stroke(.white.opacity(0.2), lineWidth: 1) + RoundedRectangle(cornerRadius: 10).stroke( + Color(white: colorScheme == .dark ? 0 : 1).opacity(colorScheme == .dark ? 1 : 0.1), lineWidth: 0.5 + ) ) .cornerRadius(10) } diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift index fa603180..7adf18de 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift @@ -160,7 +160,9 @@ public struct VwrCandidateHorizontalBackports: View { .frame(minWidth: thePool.maxWindowWidth, maxWidth: thePool.maxWindowWidth) .background(Color(white: colorScheme == .dark ? 0.1 : 1)) .overlay( - RoundedRectangle(cornerRadius: 10).stroke(.white.opacity(0.2), lineWidth: 1) + RoundedRectangle(cornerRadius: 10).stroke( + Color(white: colorScheme == .dark ? 0 : 1).opacity(colorScheme == .dark ? 1 : 0.1), lineWidth: 0.5 + ) ) .cornerRadius(10) } diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift index 46098aec..d33c1dd8 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift @@ -166,7 +166,9 @@ public struct VwrCandidateVerticalBackports: View { } .background(Color(white: colorScheme == .dark ? 0.1 : 1)) .overlay( - RoundedRectangle(cornerRadius: 10).stroke(.white.opacity(0.2), lineWidth: 1) + RoundedRectangle(cornerRadius: 10).stroke( + Color(white: colorScheme == .dark ? 0 : 1).opacity(colorScheme == .dark ? 1 : 0.1), lineWidth: 0.5 + ) ) .cornerRadius(10) }