BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-06 06:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

wayland: Don't apply display orientation on Sailfish
Some checks are pending
Build (All) / Create test plan (push) Waiting to run
Details
Build (All) / level1 (push) Blocked by required conditions
Details
Build (All) / level2 (push) Blocked by required conditions
Details

Browse source 
(cherry picked from commit 79de30a345)
This commit is contained in:
Frank Praznik 2026-02-23 11:04:11 -05:00 • committed by Sam Lantinga
parent fd494d3778
commit 03d3bffbda
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/video/wayland/SDL_waylandvideo.c
View file

@ -562,6 +562,11 @@ static void display_handle_done(void *data,
SDL_VideoData *video = driverdata->videodata; SDL_VideoData *video = driverdata->videodata;
SDL_DisplayMode native_mode, desktop_mode; SDL_DisplayMode native_mode, desktop_mode;
SDL_VideoDisplay *dpy; SDL_VideoDisplay *dpy;
#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
const SDL_bool has_qt_touch = video->touch != NULL;
#else
const SDL_bool has_qt_touch = SDL_FALSE;
#endif
const SDL_bool mode_emulation_enabled = SDL_GetHintBoolean(SDL_HINT_VIDEO_WAYLAND_MODE_EMULATION, SDL_TRUE); const SDL_bool mode_emulation_enabled = SDL_GetHintBoolean(SDL_HINT_VIDEO_WAYLAND_MODE_EMULATION, SDL_TRUE);
/* /*
@ -602,8 +607,10 @@ static void display_handle_done(void *data,
driverdata->height /= driverdata->scale_factor; driverdata->height /= driverdata->scale_factor;
} }
/* xdg-output dimensions are already transformed, so no need to rotate. */ /* xdg-output dimensions are already transformed, so no need to rotate, and Qt touch indicates Sailfish,
if (driverdata->has_logical_size || !(driverdata->transform & WL_OUTPUT_TRANSFORM_90)) { * and shouldn't be rotated.
*/
if (driverdata->has_logical_size || !(driverdata->transform & WL_OUTPUT_TRANSFORM_90) || has_qt_touch) {
desktop_mode.w = driverdata->width; desktop_mode.w = driverdata->width;
desktop_mode.h = driverdata->height; desktop_mode.h = driverdata->height;
} else { } else {
@ -625,7 +632,7 @@ static void display_handle_done(void *data,
} }
/* Calculate the display DPI */ /* Calculate the display DPI */
if (driverdata->transform & WL_OUTPUT_TRANSFORM_90) { if ((driverdata->transform & WL_OUTPUT_TRANSFORM_90) && !has_qt_touch) {
driverdata->hdpi = driverdata->physical_height ? (((float)driverdata->native_height) * 25.4f / driverdata->physical_height) : 0.0f; driverdata->hdpi = driverdata->physical_height ? (((float)driverdata->native_height) * 25.4f / driverdata->physical_height) : 0.0f;
driverdata->vdpi = driverdata->physical_width ? (((float)driverdata->native_width) * 25.4f / driverdata->physical_width) : 0.0f; driverdata->vdpi = driverdata->physical_width ? (((float)driverdata->native_width) * 25.4f / driverdata->physical_width) : 0.0f;
driverdata->ddpi = SDL_ComputeDiagonalDPI(driverdata->native_height, driverdata->ddpi = SDL_ComputeDiagonalDPI(driverdata->native_height,