diff options
| author | Dudemanguy <random342@airmail.cc> | 2024-02-24 21:35:50 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2024-02-27 22:18:12 +0000 |
| commit | 34c0a67ace7c0dcc8c53ee2ca1879135add4dc7d (patch) | |
| tree | 26c9a93491188b6618a0466267341d97069066f7 /video | |
| parent | 7b03a2ff17d0be9673eac718fef65daac0c63b38 (diff) | |
| download | mpv-34c0a67ace7c0dcc8c53ee2ca1879135add4dc7d.tar.bz2 mpv-34c0a67ace7c0dcc8c53ee2ca1879135add4dc7d.tar.xz | |
wayland: rename configured to geometry_configured (no-op)
Makes it clearer.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/wayland_common.c | 8 | ||||
| -rw-r--r-- | video/out/wayland_common.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 82eb5c9fa3..275767070a 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -1036,7 +1036,7 @@ static void handle_toplevel_config(void *data, struct xdg_toplevel *toplevel, width = height = 0; } - if (!wl->configured) { + if (!wl->geometry_configured) { /* Save initial window size if the compositor gives us a hint here. */ bool autofit_or_geometry = vo_opts->geometry.wh_valid || vo_opts->autofit.wh_valid || vo_opts->autofit_larger.wh_valid || vo_opts->autofit_smaller.wh_valid; @@ -2556,15 +2556,15 @@ bool vo_wayland_reconfig(struct vo *vo) wl->pending_vo_events |= VO_EVENT_DPI; } - if (wl->vo_opts->auto_window_resize || !wl->configured) + if (wl->vo_opts->auto_window_resize || !wl->geometry_configured) set_geometry(wl, false); if (wl->opts->configure_bounds) set_window_bounds(wl); - if (!wl->configured || !wl->locked_size) { + if (!wl->geometry_configured || !wl->locked_size) { wl->geometry = wl->window_size; - wl->configured = true; + wl->geometry_configured = true; } if (wl->vo_opts->cursor_passthrough) diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index 0f79637183..f45c732ee1 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -67,9 +67,9 @@ struct vo_wayland_state { /* State */ bool activated; - bool configured; bool focused; bool frame_wait; + bool geometry_configured; bool hidden; bool initial_size_hint; bool locked_size; |