RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 09:32:40 +00:00
Code Issues Releases Wiki Activity

wayland: remove bogus scale_change variable

Browse Source 
This was originally added in f2afae55e9
for unclear reasons (way to go me). This concept is clearly incorrect.
It doesn't matter what state the window is in. As soon as mpv detects a
scale change, it needs to reset the buffer scale of the window. Just
remove all this junk and put wl_surface_set_buffer_scale in
set_surface_scaling like it should be. Related issue: #9426.
This commit is contained in:
Dudemanguy 2021-11-08 09:44:22 -06:00
parent 73563cebf9
commit f5d545c917
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
video/out/wayland_common.c
View File

@ -646,11 +646,6 @@ static void output_handle_done(void* data, struct wl_output *wl_output)
* geometry and scaling should be recalculated. */
if (wl->current_output && wl->current_output->output == wl_output) {
set_surface_scaling(wl);
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized) {
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
} else {
wl->scale_change = true;
}
spawn_cursor(wl);
set_geometry(wl);
wl->window_size = wl->vdparams;
@ -702,11 +697,6 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
if (wl->scaling != wl->current_output->scale) {
set_surface_scaling(wl);
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized) {
wl->scale_change = true;
} else {
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
}
spawn_cursor(wl);
wl->pending_vo_events |= VO_EVENT_DPI;
}
@ -846,11 +836,6 @@ static void handle_toplevel_config(void *data, struct xdg_toplevel *toplevel,
}
}
if (wl->scale_change) {
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
wl->scale_change = false;
}
if (wl->state_change) {
if (!is_fullscreen && !is_maximized) {
wl->geometry = wl->window_size;
@ -1419,6 +1404,7 @@ static void set_surface_scaling(struct vo_wayland_state *wl)
wl->vdparams.y1 *= factor;
wl->window_size.x1 *= factor;
wl->window_size.y1 *= factor;
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
}
static int spawn_cursor(struct vo_wayland_state *wl)
@ -1583,14 +1569,7 @@ int vo_wayland_control(struct vo *vo, int *events, int request, void *arg)
if (opt == &opts->fullscreen)
toggle_fullscreen(wl);
if (opt == &opts->hidpi_window_scale)
{
set_surface_scaling(wl);
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized) {
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
} else {
wl->scale_change = true;
}
}
if (opt == &opts->window_maximized)
toggle_maximized(wl);
if (opt == &opts->window_minimized)
@ -1789,7 +1768,6 @@ int vo_wayland_reconfig(struct vo *vo)
if (!wl->current_output)
return false;
set_surface_scaling(wl);
wl_surface_set_buffer_scale(wl->surface, wl->scaling);
wl_surface_commit(wl->surface);
configure = true;
}

1
video/out/wayland_common.h
View File

@ -59,7 +59,6 @@ struct vo_wayland_state {
bool focused;
bool frame_wait;
bool hidden;
bool scale_change;
bool state_change;
bool toplevel_configured;
int display_fd;