Feature: add registerExtenalJSBridgeFunction bridge

GithuberPro · Oct 27, 2018 · a7a0533 · a7a0533
1 parent 981ff51
commit a7a0533
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/ClashX/Models/ClashRule.swift b/ClashX/Models/ClashRule.swift
@@ -11,8 +11,8 @@ import Foundation
 class ClashRule:Codable {
 
     let type:String
-    let payload:String
-    let proxy:String
+    let payload:String?
+    let proxy:String?
 }
 
 class ClashRuleResponse:Codable {

diff --git a/ClashX/ViewControllers/ClashWebViewContoller.swift b/ClashX/ViewControllers/ClashWebViewContoller.swift
@@ -13,7 +13,7 @@ import RxSwift
 import RxCocoa
 
 class ClashWebViewContoller: NSViewController {
-    let webview: WKWebView = CustomWKWebView()
+    let webview: CustomWKWebView = CustomWKWebView()
     var bridge:WebViewJavascriptBridge?
     var disposeBag = DisposeBag()
 
@@ -27,15 +27,15 @@ class ClashWebViewContoller: NSViewController {
         super.viewDidLoad()
         webview.uiDelegate = self
         webview.navigationDelegate = self
+
         if #available(OSX 10.11, *) {
             webview.customUserAgent = "ClashX Runtime"
         } else {
 //             Fallback on earlier versions
         }
         if NSAppKitVersion.current.rawValue > 1500 {
             webview.setValue(false, forKey: "drawsBackground")
-        }
-        else {
+        } else {
             webview.setValue(true, forKey: "drawsTransparentBackground")
         }
         view.addSubview(webview)
@@ -56,6 +56,7 @@ class ClashWebViewContoller: NSViewController {
         }
 
         bridge = JsBridgeHelper.initJSbridge(webview: webview, delegate: self)
+        registerExtenalJSBridgeFunction()
 
         webview.configuration.preferences.setValue(true, forKey: "developerExtrasEnabled")
 
@@ -71,21 +72,32 @@ class ClashWebViewContoller: NSViewController {
 
     override func viewWillAppear() {
         super.viewWillAppear()
-        self.view.window?.titleVisibility = .hidden
-        self.view.window?.titlebarAppearsTransparent = true
-        self.view.window?.styleMask.insert(.fullSizeContentView)
+        view.window?.titleVisibility = .hidden
+        view.window?.titlebarAppearsTransparent = true
+        view.window?.styleMask.insert(.fullSizeContentView)
 
         NSApp.activate(ignoringOtherApps: true)
-        self.view.window?.makeKeyAndOrderFront(self)
-
-        self.view.window?.isOpaque = false
-        self.view.window?.backgroundColor = NSColor.clear
+        view.window?.makeKeyAndOrderFront(self)
 
-
+        view.window?.isOpaque = false
+        view.window?.backgroundColor = NSColor.clear
+        view.window?.styleMask.remove(.resizable)
+        view.window?.styleMask.remove(.miniaturizable)
     }
 
 }
 
+extension ClashWebViewContoller {
+    func registerExtenalJSBridgeFunction(){
+        self.bridge?.registerHandler("setDragAreaHeight") {(anydata, responseCallback) in
+            if let height = anydata as? CGFloat {
+                self.webview.dragableAreaHeight = height;
+            }
+            responseCallback?(nil)
+        }
+    }
+}
+
 extension ClashWebViewContoller:WKUIDelegate,WKNavigationDelegate {
     func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
     }
@@ -111,18 +123,24 @@ extension ClashWebViewContoller:WKUIDelegate,WKNavigationDelegate {
         }
         return nil;
     }
+
 }
 
 
 class CustomWKWebView: WKWebView {
+
+    var dragableAreaHeight:CGFloat = 20;
+    let alwaysDragableLeftAreaWidth:CGFloat = 150;
+
     override func mouseDown(with event: NSEvent) {
         super.mouseDown(with: event)
+        let x = event.locationInWindow.x
         let y = (self.window?.frame.size.height ?? 0) - event.locationInWindow.y
-        if y<20 {
+
+        if x < alwaysDragableLeftAreaWidth || y < dragableAreaHeight {
             if #available(OSX 10.11, *) {
                 self.window?.performDrag(with: event)
             }
         }
-
     }
 }