fix: fullscreen surface oversized when --force-scale-factor is set (#329)#446
Closed
aki1770-del wants to merge 26 commits intosony:masterfrom
Closed
fix: fullscreen surface oversized when --force-scale-factor is set (#329)#446aki1770-del wants to merge 26 commits intosony:masterfrom
aki1770-del wants to merge 26 commits intosony:masterfrom
Conversation
The DRM backend failed to translate between view property dimensions (specified in scaled pixels) and Flutter window mentrics (specified in physical pixels). This patch fixes two issues: first, given the DRM backend (questionably) overrides the dimensions specified by the application with the native window dimensions but neglects to compensate for the current scaling factor. Secondly, cursor and touch events are not correctly mapped from physical pixels to scaled pixels. Signed-off-by: Luke Howard <lukeh@padl.com>
These scripts are heavily based on what sony provided in [1], with the container environment / cross compilation and some details fixed up to allow rebuilding an older version more easily. If these scripts live in the source repo further improvements can be made to avoid cloning flutter-embedded-linux twice more, but they are good enough for now, so let's start with what we have. Link: sony/flutter-elinux#289 (comment) [1]
Build broke with gcc-15 due to `error: unknown type name 'uint8_t'` Adding cstdint fixes that.
issues do not exist in flutter-elinux repo, so original sony links were kept Also give thanks to sony for creating the fork
fix: add missing cstdint header
Fix DRM backend dimension scaling
flutter-elinux fork: update most URLs to github.com/flutter-elinux
publish release scripts
When building with mesa 20 (debian bullseye) this define is missing, so backport it.
Building with trixie requires a recent glibc/stdc++ environment (GLIBC_2.38 / GLIBCXX_3.4.32), which might not be available on the target environment. Conversely, as far as libc/stdlib are concerned we are guarnateed to be able to run an old binary on a newer system, so building on a system as old as possible should address this particular issue. Unfortunately libflutter*so also link against system libraries (GL, X, wayland, fontconfig and many others), so if there is any so bump or imcompatible ABI then this is still far from perfect: future improvement should rebuild flutter-embedded-linux on demand for the required target, from flutter-elinux's CMake configuration The elinux embedded itself is not hard to build but libflutter_engine.so will be more work, so settle with "back to the old state" level for now.
required if mutiple platforms are available, otherwise egl may call into x11 and crash even if gbm is desired. tested on rk3588
Handle zwp_text_input_v1 and zwp_text_input_v3 purpose and hints based on flutter's TextInputType settings. This allows on-screen keyboards to adapt and e.g. display a number keypad on number input.
release build got much bigger since flutter 3.32 (for debug it went from 83MB to 385MB) This is apparently just because the lib is no longer stripped since [1] This looks like a bug since we don't target android (tentative fix in [2]), but until that lands just set --stripped manually. Even if there is no C symbol dart stacktraces are available so most people don't need these. Link: flutter/flutter#161546 [1] Link: flutter/flutter#181984 [2]
This allows compiling each individual file manually, so should fix any problem with external projects using our includes in different orders. Reported-by: Frede Hoey Braendstrup <frede@vokalo.io>
This was rebased manually but the code itself is verbatim. Tested with squeekboard/niri using the text input v3 protocol.
includes: Add missing dependent headers
release: use old bullseye container for release build
release: strip flutter engine .so again
Previous commit typo'd the ifdef, which made it have no effect. Since the define is identical the build didn't break for newer versions and CI didn't complain, but bullseye wasn't fixed as it should have, so address this. Fixes: 3ac3f1a ("drm: add DRM_MODE_CONNECTOR_USB define for old releases")
Prevents crashes by clearing cursor_info_.pointer when the pointer device (e.g., a mouse) disconnects and adding null check in UpdateFlutterCursor. Changes: - Clear cursor_info_.pointer when WL_SEAT_CAPABILITY_POINTER is removed - Add null check in UpdateFlutterCursor before accessing pointer Fixes: 434d509 ("Multiple seats (sony#417)")
…e-dangling-ref Fix cursor_info_.pointer dangling pointer on device disconnect (wayland)
Early fail if we are unable to create a render surface to avoid nullptr dereference crashes further down the track. Fixes: sony#14 Signed-off-by: Luke Howard <lukeh@padl.com>
Check CreateRenderSurface() return value
…ony#329) When --fullscreen and --force-scale-factor=N are combined, the Wayland surface was created at native_width*N x native_height*N instead of the native display resolution. For example, a 800x480 display with --force-scale-factor=1.3 produced a 1040x624 surface, causing UI to render partially off-screen. Root cause: wl_output_listener.mode stored the native display pixels directly in view_properties_.width/height for the fullscreen case, but the rest of the codebase treats view_properties_ as logical DIP. The subsequent multiplication by current_scale_ in CreateRenderSurface then over-scaled the surface dimensions. force_scale_factor is intended to adjust the Flutter engine's device pixel ratio (DPR) so that UI elements appear larger, not to increase the surface buffer beyond the display's native resolution. The fix: 1. wl_output_listener.mode: when force_scale_factor is set, store the display dimensions as logical DIP (width / current_scale_), consistent with the xdg_toplevel_listener.configure callback which already does this. 2. CreateRenderSurface: when force_scale_factor is set and display_max dimensions are known, use display_max directly to avoid float rounding. Signed-off-by: Akihiko Komada <aki1770@gmail.com>
aki1770-del
force-pushed
the
fix/fullscreen-scale-factor-329
branch
from
43f0900 to
dc6bbd1
Compare
Author
|
Repo has migrated to flutter-elinux/flutter-embedded-linux. Re-opening at https://github.com/flutter-elinux/flutter-embedded-linux. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
When
--fullscreenand--force-scale-factor=Nare combined, the Wayland surface is created atnative_width × N×native_height × Ninstead of the native display resolution. On an 800×480 display with--force-scale-factor=1.3, the surface becomes 1040×624, causing UI to extend off-screen (portions rendered outside the display area).Reported in #329. Confirmed by two maintainers.
Root cause
wl_output_listener.modestores native display pixels directly inview_properties_.width/heightfor the fullscreen case. The rest of the codebase treatsview_properties_as logical DIP and multiplies bycurrent_scale_to get physical dimensions — soCreateRenderSurfaceends up atnative_px × scaleinstead ofnative_px.force_scale_factoris for adjusting the Flutter engine's device pixel ratio (DPR) so UI elements appear larger. It does not change the physical display resolution. Thewl_surface_set_buffer_scalecall receives the float value truncated to an integer (e.g. 1.3 → 1), so any surface buffer larger than native resolution is incorrect.The
xdg_toplevel_listener.configurecallback already handles this correctly (next_width_dip = width / current_scale_). This fix makeswl_output_listener.modeconsistent.Fix
Two changes, both guarded by
force_scale_factorso the auto-detected HiDPI path (wl_output.scale) is unchanged:wl_output_listener.mode: store display dimensions as logical DIP (width / current_scale_) whenforce_scale_factoris set, consistent withxdg_toplevel_listener.configure.CreateRenderSurface: usedisplay_max_width_/height_directly whenforce_scale_factoris set, avoiding floating-point rounding for non-integer scale values like 1.3.Before / after
On an 800×480 display with
--fullscreen --force-scale-factor=1.3:OnWindowSizeChangedreportsNon-
force_scale_factorpath: unchanged.Fixes #329