xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make HUD window front but not in focus

Browse Source
This commit is contained in:
Vicent Tsai
2017-04-08 11:45:21 +08:00
parent 406e0d40ad
commit 4674d9a947
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Podfile.lock
View File

@ -27,4 +27,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: e59f622df37d0fe135432c1ccda243973c311def PODFILE CHECKSUM: e59f622df37d0fe135432c1ccda243973c311def
COCOAPODS: 1.2.0 COCOAPODS: 1.2.0.beta.1

2
Pods/Manifest.lock generated
View File

@ -27,4 +27,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: e59f622df37d0fe135432c1ccda243973c311def PODFILE CHECKSUM: e59f622df37d0fe135432c1ccda243973c311def
COCOAPODS: 1.2.0 COCOAPODS: 1.2.0.beta.1

2
Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG-frameworks.sh generated
View File

@ -59,7 +59,7 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy # Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1""
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &" code_sign_cmd="$code_sign_cmd &"

2
Pods/Target Support Files/Pods-ShadowsocksX-NGTests/Pods-ShadowsocksX-NGTests-frameworks.sh generated
View File

@ -59,7 +59,7 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy # Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1""
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &" code_sign_cmd="$code_sign_cmd &"

2
Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper-frameworks.sh generated
View File

@ -59,7 +59,7 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy # Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1""
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &" code_sign_cmd="$code_sign_cmd &"

4
ShadowsocksX-NG/AppDelegate.swift
View File

@ -562,8 +562,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
toastWindowCtrl = ToastWindowController(windowNibName: "ToastWindowController") toastWindowCtrl = ToastWindowController(windowNibName: "ToastWindowController")
toastWindowCtrl.message = message toastWindowCtrl.message = message
toastWindowCtrl.showWindow(self) toastWindowCtrl.showWindow(self)
NSApp.activate(ignoringOtherApps: true) //NSApp.activate(ignoringOtherApps: true)
toastWindowCtrl.window?.makeKeyAndOrderFront(self) //toastWindowCtrl.window?.makeKeyAndOrderFront(self)
toastWindowCtrl.fadeInHud() toastWindowCtrl.fadeInHud()
} }
} }

7
ShadowsocksX-NG/ToastWindowController.swift
View File

@ -34,10 +34,11 @@ class ToastWindowController: NSWindowController {
if let win = self.window { if let win = self.window {
win.isOpaque = false win.isOpaque = false
win.backgroundColor = .clear win.backgroundColor = .clear
win.level = Int(CGWindowLevelForKey(.utilityWindow)) + 1000
win.styleMask = .borderless win.styleMask = .borderless
win.hidesOnDeactivate = false win.hidesOnDeactivate = false
win.collectionBehavior = .canJoinAllSpaces win.collectionBehavior = .canJoinAllSpaces
win.level = Int(CGWindowLevelForKey(.floatingWindow))
win.orderFrontRegardless()
} }
let viewLayer: CALayer = CALayer() let viewLayer: CALayer = CALayer()
@ -83,8 +84,6 @@ class ToastWindowController: NSWindowController {
fadingOut = false fadingOut = false
self.window?.orderFrontRegardless()
CATransaction.begin() CATransaction.begin()
CATransaction.setAnimationDuration(kHudFadeInDuration) CATransaction.setAnimationDuration(kHudFadeInDuration)
CATransaction.setCompletionBlock { self.didFadeIn() } CATransaction.setCompletionBlock { self.didFadeIn() }
@ -113,7 +112,7 @@ class ToastWindowController: NSWindowController {
func didFadeOut() -> Void { func didFadeOut() -> Void {
if fadingOut { if fadingOut {
self.window?.orderOut(nil) self.window?.orderOut(self)
} }
fadingOut = false fadingOut = false
} }