From e23239ecd968d72ea48015fcf62cc315ced55e0b Mon Sep 17 00:00:00 2001 From: mrFq1 <1xxbx0il0@mozmail.com> Date: Thu, 18 May 2023 14:50:13 +0800 Subject: [PATCH] refactor: List background color --- ClashX Dashboard.xcodeproj/project.pbxproj | 4 ---- .../Views/APISetting/APISettingView.swift | 5 +++++ ClashX Dashboard/Views/ClearBackgroundList.swift | 16 ---------------- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 ClashX Dashboard/Views/ClearBackgroundList.swift diff --git a/ClashX Dashboard.xcodeproj/project.pbxproj b/ClashX Dashboard.xcodeproj/project.pbxproj index 8163a21..fad7d44 100644 --- a/ClashX Dashboard.xcodeproj/project.pbxproj +++ b/ClashX Dashboard.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 015278082A15F9FD00516236 /* ProxyProviderInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015278072A15F9FD00516236 /* ProxyProviderInfoView.swift */; }; 0155D39629F2342F00869830 /* TrafficGraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155D39529F2342F00869830 /* TrafficGraphView.swift */; }; 0155D39829F23BDE00869830 /* OverviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155D39729F23BDE00869830 /* OverviewView.swift */; }; - 0172CB4F29E562960072DDEF /* ClearBackgroundList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172CB4E29E562960072DDEF /* ClearBackgroundList.swift */; }; 0172CB5129E5AE670072DDEF /* SwiftUIViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172CB5029E5AE670072DDEF /* SwiftUIViewExtensions.swift */; }; 017753C029EF7FB2006999DB /* APIServerItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017753BF29EF7FB1006999DB /* APIServerItem.swift */; }; 017DCADD29E83BFD00B9622A /* RuleProviderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017DCADC29E83BFD00B9622A /* RuleProviderView.swift */; }; @@ -74,7 +73,6 @@ 015278072A15F9FD00516236 /* ProxyProviderInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyProviderInfoView.swift; sourceTree = ""; }; 0155D39529F2342F00869830 /* TrafficGraphView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrafficGraphView.swift; sourceTree = ""; }; 0155D39729F23BDE00869830 /* OverviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OverviewView.swift; sourceTree = ""; }; - 0172CB4E29E562960072DDEF /* ClearBackgroundList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClearBackgroundList.swift; sourceTree = ""; }; 0172CB5029E5AE670072DDEF /* SwiftUIViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIViewExtensions.swift; sourceTree = ""; }; 017753BF29EF7FB1006999DB /* APIServerItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIServerItem.swift; sourceTree = ""; }; 017DCADC29E83BFD00B9622A /* RuleProviderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleProviderView.swift; sourceTree = ""; }; @@ -179,7 +177,6 @@ 010F693929ED638B00BAAFB5 /* APISetting */, 0192318129DD709500539EDD /* SidebarView */, 0192317429DD5D7400539EDD /* ContentTabs */, - 0172CB4E29E562960072DDEF /* ClearBackgroundList.swift */, 019D6A8629F015DF00A6AC02 /* ArrayExtensions.swift */, 0172CB5029E5AE670072DDEF /* SwiftUIViewExtensions.swift */, ); @@ -455,7 +452,6 @@ 0192316129DD4DCF00539EDD /* ContentView.swift in Sources */, 01DCEFB32A150FB300DBBDB3 /* ProxyProvidersRowView.swift in Sources */, 0192318729DD83FF00539EDD /* OverviewTopItemView.swift in Sources */, - 0172CB4F29E562960072DDEF /* ClearBackgroundList.swift in Sources */, 0192318029DD5E0B00539EDD /* LogsView.swift in Sources */, 01505C4E2A14AAEB001ACC4F /* ProviderProxiesView.swift in Sources */, 0192318529DD7DCD00539EDD /* SidebarItemView.swift in Sources */, diff --git a/ClashX Dashboard/Views/APISetting/APISettingView.swift b/ClashX Dashboard/Views/APISetting/APISettingView.swift index 94dcdf5..b7b86e8 100644 --- a/ClashX Dashboard/Views/APISetting/APISettingView.swift +++ b/ClashX Dashboard/Views/APISetting/APISettingView.swift @@ -5,6 +5,7 @@ // import SwiftUI +import Introspect struct APISettingView: View { @State var baseURL: String = "" @@ -61,6 +62,10 @@ struct APISettingView: View { } } } + .introspectTableView { + $0.backgroundColor = NSColor.clear + $0.enclosingScrollView?.drawsBackground = false + } } .padding(.top) .fixedSize(horizontal: true, vertical: false) diff --git a/ClashX Dashboard/Views/ClearBackgroundList.swift b/ClashX Dashboard/Views/ClearBackgroundList.swift deleted file mode 100644 index 567a0ca..0000000 --- a/ClashX Dashboard/Views/ClearBackgroundList.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// ClearBackgroundList.swift -// ClashX Dashboard -// -// - -import Foundation -import SwiftUI - -extension NSTableView { - open override func viewWillMove(toWindow newWindow: NSWindow?) { - super.viewDidMoveToWindow() - backgroundColor = NSColor.clear - enclosingScrollView!.drawsBackground = false - } -}