From 0a270e3513bdf9ad137df244f52b8ccc19a5e674 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 13 Apr 2023 13:14:24 +1000 Subject: [PATCH] Revert "GHOST/Wayland: avoid up-scaling window content" This reverts commit 4fe26856152304350930dbeebc31521aa31f0f9f. Always use the preferred_scale requested by the compositor as this did not work so well in the intended use case (where the low resolution monitor text was scaled down and difficult to see). After discussion with @ZedDB, revert this change since there are cases where either functionality might be preferred - to ensure Blender's UI is visible on a low resolution mirrored projector for e.g. Changing the behavior of the preferred scale makes most sense in the compositor, instead of controlling it on a per-application basis. --- intern/ghost/intern/GHOST_WindowWayland.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/intern/ghost/intern/GHOST_WindowWayland.cc b/intern/ghost/intern/GHOST_WindowWayland.cc index 4ffb6c20539..408f9fbe1a2 100644 --- a/intern/ghost/intern/GHOST_WindowWayland.cc +++ b/intern/ghost/intern/GHOST_WindowWayland.cc @@ -1978,16 +1978,6 @@ bool GHOST_WindowWayland::outputs_changed_update_scale() fractional_scale_next = fractional_scale_from_output; scale_next = fractional_scale_next / FRACTIONAL_DENOMINATOR; } - else { - /* NOTE(@ideasman42): This often overrides #wp_fractional_scale_v1_listener::preferred_scale - * in favor of using the greatest overlapping scale. - * This was requested by the studio to prevent a tablet's built-in display of 75% - * from causing the main-display being up-scaled (showing pixelated). */ - if (fractional_scale_next < fractional_scale_from_output) { - fractional_scale_next = fractional_scale_from_output; - scale_next = fractional_scale_next / FRACTIONAL_DENOMINATOR; - } - } bool changed = false;