RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cocoa-cb: add runtime dpi change and use proper fallback for initial dpi 

at the time of the initial dpi query the window is not instantiated yet.
we use a proper fallback in that case, eg the target configured screen
or the main screen if none is set.

also change some weird oversight and a small optimisation.
This commit is contained in:
der richter 2020-01-08 20:58:54 +01:00
parent 7bb3f53cf5
commit e6c9e33a31
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/cocoa-cb/window.swift
View File

@ -476,7 +476,7 @@ class Window: NSWindow, NSWindowDelegate {
func windowDidChangeBackingProperties(_ notification: Notification) {
cocoaCB.layer?.contentsScale = backingScaleFactor
cocoaCB.flagEvents(VO_EVENT_WIN_STATE)
cocoaCB.flagEvents(VO_EVENT_DPI)
}
func windowWillStartLiveResize(_ notification: Notification) {

9
video/out/cocoa_cb_common.swift
View File

@ -371,7 +371,7 @@ class CocoaCB: NSObject {
}
func getTargetScreen(forFullscreen fs: Bool) -> NSScreen? {
let screenID = fs ? (mpv?.opts.fsscreen_id ?? 100) : (mpv?.opts.screen_id ?? 100)
let screenID = fs ? (mpv?.opts.fsscreen_id ?? 0) : (mpv?.opts.screen_id ?? 0)
return getScreenBy(id: Int(screenID))
}
@ -487,7 +487,10 @@ class CocoaCB: NSObject {
return VO_FALSE
case VOCTRL_GET_HIDPI_SCALE:
if let scaleFactor = data?.assumingMemoryBound(to: CDouble.self) {
scaleFactor.pointee = Double(ccb.window?.backingScaleFactor ?? 1.0)
let factor = ccb.window?.backingScaleFactor ??
ccb.getTargetScreen(forFullscreen: false)?.backingScaleFactor ??
NSScreen.main?.backingScaleFactor ?? 1.0
scaleFactor.pointee = Double(factor)
return VO_TRUE;
}
return VO_FALSE
@ -524,7 +527,7 @@ class CocoaCB: NSObject {
var array: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>? = nil
var count: Int32 = 0
let screen = ccb.window != nil ? ccb.window?.screen :
ccb.getScreenBy(id: Int(ccb.mpv?.opts.screen_id ?? 0)) ??
ccb.getTargetScreen(forFullscreen: false) ??
NSScreen.main
let displayName = screen?.displayName ?? "Unknown"