RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

x11_common: fix Xft.dpi detection ignoring --hidpi-window-scale

Browse Source 
closes #13466
fixes: 4b69164147
This commit is contained in:
sfan5 2024-02-12 13:51:25 +01:00
parent cbcf12cdbd
commit 4981690fb6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/out/x11_common.c
View File

@ -617,7 +617,7 @@ static void vo_x11_get_x11_screen_dpi_scale(struct vo_x11_state *x11)
double dpi_x = x11->ws_width * 25.4 / w_mm; double dpi_x = x11->ws_width * 25.4 / w_mm;
double dpi_y = x11->ws_height * 25.4 / h_mm; double dpi_y = x11->ws_height * 25.4 / h_mm;
double base_dpi = 96; double base_dpi = 96;
if (isfinite(dpi_x) && isfinite(dpi_y) && x11->opts->hidpi_window_scale) { if (isfinite(dpi_x) && isfinite(dpi_y)) {
int s_x = lrint(MPCLAMP(2 * dpi_x / base_dpi, 0, 20)); int s_x = lrint(MPCLAMP(2 * dpi_x / base_dpi, 0, 20));
int s_y = lrint(MPCLAMP(2 * dpi_y / base_dpi, 0, 20)); int s_y = lrint(MPCLAMP(2 * dpi_y / base_dpi, 0, 20));
if (s_x == s_y && s_x > 2 && s_x < 20) { if (s_x == s_y && s_x > 2 && s_x < 20) {
@ -731,8 +731,10 @@ bool vo_x11_init(struct vo *vo)
x11->ws_width, x11->ws_height, dispName, x11->ws_width, x11->ws_height, dispName,
x11->display_is_local ? "local" : "remote"); x11->display_is_local ? "local" : "remote");
if (!vo_x11_get_xft_dpi_scale(x11)) if (x11->opts->hidpi_window_scale) {
vo_x11_get_x11_screen_dpi_scale(x11); if (!vo_x11_get_xft_dpi_scale(x11))
vo_x11_get_x11_screen_dpi_scale(x11);
}
x11->wm_type = vo_wm_detect(vo); x11->wm_type = vo_wm_detect(vo);