From 1d2716139f28d66fc30ab8ec1cb9e6050c250815 Mon Sep 17 00:00:00 2001
From: Irastris <irastris15@gmail.com>
Date: Wed, 6 May 2026 19:49:57 -0400
Subject: [PATCH] Redesign PresetWindow

---
 res/rml/window.rcss    | 38 +++++---------------------------------
 src/dusk/ui/preset.cpp | 22 ++++++++++++++--------
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/res/rml/window.rcss b/res/rml/window.rcss
index 55ea0294eb..c40bd61227 100644
--- a/res/rml/window.rcss
+++ b/res/rml/window.rcss
@@ -39,10 +39,6 @@ window.small {
     width: auto;
 }
 
-window.preset {
-    min-width: 650dp;
-}
-
 window.modal {
     max-width: 640dp;
 }
@@ -283,6 +279,10 @@ icon.error {
     decorator: text("&#xe000;" center center);
 }
 
+icon.celebration {
+    decorator: text("&#xea65;" center center);
+}
+
 .achievement-row {
     display: flex;
     align-items: flex-start;
@@ -366,35 +366,13 @@ button.achievement-clear {
     opacity: 0.45;
 }
 
-.preset-dialog {
-    display: flex;
-    flex-flow: column;
-    padding: 32dp;
-    gap: 20dp;
-    flex: 0 1 auto;
-}
-
-.preset-title {
-    display: block;
-    font-family: "Fira Sans Condensed";
-    font-weight: bold;
-    font-size: 30dp;
-    text-align: center;
-}
-
-.preset-intro {
-    display: block;
-    font-size: 18dp;
-    text-align: center;
-    color: rgba(224, 219, 200, 65%);
-}
-
 .preset-grid {
     display: flex;
     flex-direction: row;
     gap: 20dp;
     flex: 0 1 auto;
     align-items: flex-start;
+    width: 100%;
 }
 
 .preset-col {
@@ -404,15 +382,9 @@ button.achievement-clear {
     flex: 1 1 0;
 }
 
-button.preset-btn {
-    font-size: 22dp;
-    padding: 20dp 16dp;
-}
-
 .preset-desc {
     display: block;
     font-size: 16dp;
-    color: rgba(224, 219, 200, 65%);
     text-align: center;
 }
 
diff --git a/src/dusk/ui/preset.cpp b/src/dusk/ui/preset.cpp
index d83d30cda9..f8c346bfd3 100644
--- a/src/dusk/ui/preset.cpp
+++ b/src/dusk/ui/preset.cpp
@@ -47,16 +47,23 @@ void applyPresetDusk() {
 
 }  // namespace
 
-PresetWindow::PresetWindow() : WindowSmall("preset", "preset-dialog") {
-    auto* title = append(mDialog, "div");
-    title->SetClass("preset-title", true);
-    title->SetInnerRML("Welcome to Dusk!");
+PresetWindow::PresetWindow() : WindowSmall("modal", "modal-dialog") {
+    mDialog->SetClass("modal-dialog", true);
+
+    auto* header = append(mDialog, "div");
+    header->SetClass("modal-header", true);
+
+    auto* title = append(header, "div");
+    title->SetClass("modal-title", true);
+    title->SetInnerRML("Welcome to Dusk");
+
+    auto* headIcon = append(header, "icon");
+    headIcon->SetClass("celebration", true);
 
     auto* intro = append(mDialog, "div");
-    intro->SetClass("preset-intro", true);
+    intro->SetClass("modal-body", true);
     intro->SetInnerRML(
-        "Choose a preset to get started.<br/>"
-        "You can change any setting later from the Settings menu.");
+        "Choose a preset to get started. You can change any setting later from the Settings menu.");
 
     auto* grid = append(mDialog, "div");
     grid->SetClass("preset-grid", true);
@@ -83,7 +90,6 @@ PresetWindow::PresetWindow() : WindowSmall("preset", "preset-dialog") {
         col->SetClass("preset-col", true);
 
         auto btn = std::make_unique<Button>(col, Rml::String(preset.name));
-        btn->root()->SetClass("preset-btn", true);
         btn->on_nav_command([this, apply = preset.apply](Rml::Event&, NavCommand cmd) {
             if (cmd == NavCommand::Confirm) {
                 apply();