mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 16:10:41 -05:00
wayland: Use new highest scale monitor tracking for fractional_scale_v1
This ensures consistency with the surface pixel alignment transforms. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2726>
This commit is contained in:
parent
f671cec514
commit
ae403f2e94
@ -1410,45 +1410,36 @@ surface_output_disconnect_signals (gpointer key,
|
||||
surface);
|
||||
}
|
||||
|
||||
static void
|
||||
get_highest_output_scale (gpointer key,
|
||||
gpointer value,
|
||||
gpointer data)
|
||||
{
|
||||
MetaWaylandOutput *wayland_output = value;
|
||||
MetaLogicalMonitor *logical_monitor =
|
||||
meta_wayland_output_get_logical_monitor (wayland_output);
|
||||
double *scale = data;
|
||||
double new_scale;
|
||||
|
||||
new_scale = meta_logical_monitor_get_scale (logical_monitor);
|
||||
if (new_scale > *scale)
|
||||
*scale = new_scale;
|
||||
}
|
||||
|
||||
double
|
||||
meta_wayland_surface_get_highest_output_scale (MetaWaylandSurface *surface)
|
||||
{
|
||||
double scale = 0.0;
|
||||
MetaWindow *window;
|
||||
MetaLogicalMonitor *logical_monitor;
|
||||
|
||||
g_hash_table_foreach (surface->outputs, get_highest_output_scale, &scale);
|
||||
window = meta_wayland_surface_get_window (surface);
|
||||
if (!window)
|
||||
goto out;
|
||||
|
||||
logical_monitor = meta_window_get_highest_scale_monitor (window);
|
||||
if (!logical_monitor)
|
||||
goto out;
|
||||
|
||||
scale = meta_logical_monitor_get_scale (logical_monitor);
|
||||
|
||||
out:
|
||||
return scale;
|
||||
}
|
||||
|
||||
void
|
||||
meta_wayland_surface_update_outputs (MetaWaylandSurface *surface)
|
||||
{
|
||||
double scale;
|
||||
|
||||
if (!surface->compositor)
|
||||
return;
|
||||
|
||||
g_hash_table_foreach (surface->compositor->outputs,
|
||||
update_surface_output_state,
|
||||
surface);
|
||||
|
||||
scale = meta_wayland_surface_get_highest_output_scale (surface);
|
||||
meta_wayland_fractional_scale_maybe_send_preferred_scale (surface, scale);
|
||||
}
|
||||
|
||||
void
|
||||
@ -2411,6 +2402,21 @@ meta_wayland_surface_is_xwayland (MetaWaylandSurface *surface)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
protocol_state_handle_highest_scale_monitor (MetaWaylandSurface *surface)
|
||||
{
|
||||
MetaWaylandSurface *subsurface_surface;
|
||||
double scale;
|
||||
|
||||
scale = meta_wayland_surface_get_highest_output_scale (surface);
|
||||
|
||||
meta_wayland_fractional_scale_maybe_send_preferred_scale (surface, scale);
|
||||
|
||||
META_WAYLAND_SURFACE_FOREACH_SUBSURFACE (&surface->protocol_state,
|
||||
subsurface_surface)
|
||||
protocol_state_handle_highest_scale_monitor (subsurface_surface);
|
||||
}
|
||||
|
||||
static void
|
||||
output_state_handle_highest_scale_monitor (MetaWaylandSurface *surface)
|
||||
{
|
||||
@ -2429,4 +2435,5 @@ void
|
||||
meta_wayland_surface_notify_highest_scale_monitor (MetaWaylandSurface *surface)
|
||||
{
|
||||
output_state_handle_highest_scale_monitor (surface);
|
||||
protocol_state_handle_highest_scale_monitor (surface);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user