From 76d97e202b4899c2cd14f427ef9a01629e2ca268 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Mon, 19 Jan 2026 19:53:29 +0100 Subject: [PATCH] fix settings layout for RmlUi 6.2: toggle positioning and flexbox sizing --- designer/CMakeLists.txt | 2 +- src/main/assets/apps/settings/settings.rml | 27 ++++++++++------------ src/main/cpp/CMakeLists.txt | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt index eea9955..cd880c4 100644 --- a/designer/CMakeLists.txt +++ b/designer/CMakeLists.txt @@ -18,7 +18,7 @@ include(FetchContent) FetchContent_Declare( rmlui GIT_REPOSITORY https://github.com/mikke89/RmlUi.git - GIT_TAG 6.0 + GIT_TAG 6.2 ) set(RMLUI_LUA_BINDINGS ON CACHE BOOL "" FORCE) set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) diff --git a/src/main/assets/apps/settings/settings.rml b/src/main/assets/apps/settings/settings.rml index c976225..9c37cb5 100644 --- a/src/main/assets/apps/settings/settings.rml +++ b/src/main/assets/apps/settings/settings.rml @@ -24,7 +24,7 @@ .settings-section { margin-bottom: 8px; - width: 100%; + width: 540px; display: flex; flex-direction: column; } @@ -37,13 +37,14 @@ } .settings-item { + width: 540px; + box-sizing: border-box; display: flex; - align-items: center; + flex-direction: row; padding: 16px; cursor: pointer; background-color: #1E1E1E; - width: 100%; - box-sizing: border-box; + overflow: hidden; } .settings-item:hover { @@ -51,17 +52,13 @@ } .settings-item + .settings-item { - border-top-width: 1px; - border-top-color: #333333; + border-top: 1px #333333; } .settings-icon { width: 56px; height: 56px; margin-right: 16px; - display: flex; - align-items: center; - justify-content: center; font-size: 28px; color: #B3B3B3; } @@ -91,8 +88,8 @@ height: 32px; border-radius: 16px; background-color: #666666; - position: relative; cursor: pointer; + position: relative; } .settings-toggle.active { @@ -120,13 +117,14 @@ } .user-card { + width: 540px; + box-sizing: border-box; display: flex; + flex-direction: row; align-items: center; padding: 20px 16px; background-color: #1E1E1E; margin-bottom: 8px; - width: 100%; - box-sizing: border-box; } .user-avatar { @@ -135,11 +133,10 @@ border-radius: 32px; background-color: #BB86FC; margin-right: 16px; - display: flex; - align-items: center; - justify-content: center; font-size: 28px; color: #000000; + text-align: center; + line-height: 64px; } .user-info { diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt index 25030fa..a7f1893 100644 --- a/src/main/cpp/CMakeLists.txt +++ b/src/main/cpp/CMakeLists.txt @@ -22,7 +22,7 @@ include(FetchContent) FetchContent_Declare( rmlui GIT_REPOSITORY https://github.com/mikke89/RmlUi.git - GIT_TAG master + GIT_TAG 6.2 ) set(RMLUI_LUA_BINDINGS ON CACHE BOOL "" FORCE) set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)