floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repo // Enable CGShieldingWindowLevel(). 

- We use the max value between CGShieldingWindowLevel() and kCGPopUpMenuWindowLevel.
This commit is contained in:
ShikiSuen 2023-02-05 09:44:45 +08:00
parent 361a99ccf3
commit 0d3a727d9d
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/CtlCandidateTDK.swift
View File

@ -74,7 +74,7 @@ public class CtlCandidateTDK: CtlCandidate {
let panel = NSPanel( let panel = NSPanel(
contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false
) )
panel.level = NSWindow.Level(Int(kCGPopUpMenuWindowLevel) + 2) panel.level = NSWindow.Level(Int(max(CGShieldingWindowLevel(), kCGPopUpMenuWindowLevel)) + 2)
panel.hasShadow = true panel.hasShadow = true
panel.isOpaque = false panel.isOpaque = false
panel.backgroundColor = NSColor.clear panel.backgroundColor = NSColor.clear

2
Packages/vChewing_NotifierUI/Sources/NotifierUI/NotifierUI.swift
View File

@ -97,7 +97,7 @@ public class Notifier: NSWindowController {
) )
theWindow.contentView = transparentVisualEffect theWindow.contentView = transparentVisualEffect
theWindow.isMovableByWindowBackground = true theWindow.isMovableByWindowBackground = true
theWindow.level = NSWindow.Level(Int(kCGPopUpMenuWindowLevel)) theWindow.level = NSWindow.Level(Int(max(CGShieldingWindowLevel(), kCGPopUpMenuWindowLevel)))
theWindow.hasShadow = true theWindow.hasShadow = true
theWindow.backgroundColor = .textBackgroundColor theWindow.backgroundColor = .textBackgroundColor
theWindow.title = "" theWindow.title = ""

2
Packages/vChewing_PopupCompositionBuffer/Sources/PopupCompositionBuffer/PopupCompositionBuffer.swift
View File

@ -32,7 +32,7 @@ public class PopupCompositionBuffer: NSWindowController {
let panel = NSPanel( let panel = NSPanel(
contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false
) )
panel.level = NSWindow.Level(Int(kCGPopUpMenuWindowLevel) + 1) panel.level = NSWindow.Level(Int(max(CGShieldingWindowLevel(), kCGPopUpMenuWindowLevel)) + 1)
panel.hasShadow = true panel.hasShadow = true
panel.backgroundColor = NSColor.controlBackgroundColor panel.backgroundColor = NSColor.controlBackgroundColor
panel.styleMask = .fullSizeContentView panel.styleMask = .fullSizeContentView

2
Packages/vChewing_TooltipUI/Sources/TooltipUI/TooltipUI.swift
View File

@ -34,7 +34,7 @@ public class TooltipUI: NSWindowController {
let panel = NSPanel( let panel = NSPanel(
contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false
) )
panel.level = NSWindow.Level(Int(kCGPopUpMenuWindowLevel) + 2) panel.level = NSWindow.Level(Int(max(CGShieldingWindowLevel(), kCGPopUpMenuWindowLevel)) + 2)
panel.hasShadow = true panel.hasShadow = true
panel.backgroundColor = NSColor.controlBackgroundColor panel.backgroundColor = NSColor.controlBackgroundColor
panel.isMovable = false panel.isMovable = false

6
Source/Modules/SessionCtl_HandleDisplay.swift
View File

@ -73,7 +73,7 @@ extension SessionCtl {
} }
public func showCandidates() { public func showCandidates() {
guard let client = client() else { return } guard client() != nil else { return }
updateVerticalTypingStatus() updateVerticalTypingStatus()
isVerticalCandidateWindow = (isVerticalTyping || !PrefMgr.shared.useHorizontalCandidateList) isVerticalCandidateWindow = (isVerticalTyping || !PrefMgr.shared.useHorizontalCandidateList)
@ -127,9 +127,7 @@ extension SessionCtl {
if #available(macOS 10.14, *) { if #available(macOS 10.14, *) {
// Spotlight 視窗會擋住 IMK 選字窗，所以需要特殊處理。 // Spotlight 視窗會擋住 IMK 選字窗，所以需要特殊處理。
if let ctlCandidateCurrent = candidateUI as? CtlCandidateIMK { if let ctlCandidateCurrent = candidateUI as? CtlCandidateIMK {
while ctlCandidateCurrent.windowLevel() <= client.windowLevel() { ctlCandidateCurrent.setWindowLevel(UInt64(CGShieldingWindowLevel() + 2))
ctlCandidateCurrent.setWindowLevel(UInt64(max(0, client.windowLevel() + 1000)))
}
} }
} }