Skip to content

Commit 4d5f606

Browse files
committed
无法从Dock栏恢应用图标复最小化的窗口问题修复 #38
1 parent 8bf7fea commit 4d5f606

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

redis-pro/Common/RedisClient/RediStackClient.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class RediStackClient {
2323
var redisModel:RedisModel
2424

2525
// conn
26-
private let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 3)
26+
private let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 2)
2727
var connection:RedisConnection?
2828
var connPool:RedisConnectionPool?
2929

redis-pro/redis_proApp.swift

+19-18
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ struct redis_proApp: App {
3434
WindowGroup {
3535
IndexView()
3636
.onChange(of: scenePhase) { newPhase in
37+
logger.info("redis pro scene phase change: \(newPhase)")
3738
if newPhase == .active {
38-
logger.info("app active")
3939
} else if newPhase == .inactive {
40-
logger.info("app inactive")
4140
// NSApp.hide(self)
4241
// NSApp.miniaturizeAll(self)
4342
} else if newPhase == .background {
44-
logger.info("app background")
4543
}
4644
}
4745
}
@@ -71,6 +69,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
7169

7270
func applicationDidFinishLaunching(_ notification: Notification) {
7371
logger.info("redis pro launch complete")
72+
73+
//必须加上 applicationShouldHandleReopen 方法才会被执行,参考: https://developer.apple.com/forums/thread/706772?answerId=715063022#715063022
74+
NSApplication.shared.delegate = self
75+
7476
// appcenter
7577
AppCenter.start(withAppSecret: "310d1d33-2570-46f9-a60d-8a862cdef6c7", services:[
7678
Analytics.self,
@@ -105,25 +107,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
105107

106108
func applicationWillBecomeActive(_ notification: Notification) {
107109
logger.info("redis applicationWillBecomeActive...")
110+
if let window = NSApp.windows.first {
111+
window.deminiaturize(nil)
112+
}
108113
}
109114

110115
func applicationWillResignActive(_:Notification) {
111116
logger.info("redis pro applicationWillResignActive...")
112117
}
113-
// func applicationWillUpdate(_:Notification) {
114-
// logger.info("redis pro applicationWillUpdate...")
115-
// }
116-
117-
118-
// func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows: Bool) -> Bool {
119-
// logger.info("redis applicationShouldHandleReopen...")
120-
// return true
121-
// }
122-
//
123-
// func applicationShouldOpenUntitledFile(_:NSApplication) -> Bool {
124-
// logger.info("redis applicationShouldOpenUntitledFile...")
125-
// return true
126-
//
127-
// }
118+
119+
func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows: Bool) -> Bool {
120+
logger.info("redis pro applicationShouldHandleReopen...")
121+
return true
122+
}
123+
124+
func applicationShouldOpenUntitledFile(_:NSApplication) -> Bool {
125+
logger.info("redis pro applicationShouldOpenUntitledFile...")
126+
return true
127+
128+
}
128129

129130
}

0 commit comments

Comments
 (0)