mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-20 14:44:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Preset tweaks

Browse Source
This commit is contained in:
Luke Street
2026-05-04 13:08:14 -06:00
parent 208433047a
commit 74f2c58b29
5 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/imgui/ImGuiConsole.cpp
-8
View File
@@ -304,14 +304,6 @@ namespace dusk {
}
ImGui::PopStyleColor();
if (!getSettings().backend.wasPresetChosen) {
if (!m_presetShown) {
m_presetShown = true;
dusk::ui::push_document(std::make_unique<dusk::ui::PresetWindow>());
}
return;
}
if (dusk::IsGameLaunched && !m_isLaunchInitialized) {
AddToast(ImGui::GetIO().MouseSource == ImGuiMouseSource_TouchScreen ?
"3-finger tap to toggle menu"s :
src/dusk/imgui/ImGuiConsole.hpp
-1
View File
@@ -44,7 +44,6 @@ private:
ImVec2 m_dragScrollLastMousePos = {};
std::deque<Toast> m_toasts;
bool m_presetShown = false;
ImGuiMenuGame m_menuGame;
ImGuiPreLaunchWindow m_preLaunchWindow;
src/dusk/ui/preset.cpp
+7 -7
View File
@@ -61,7 +61,7 @@ const Rml::String kDocumentSource = R"RML(
<link type="text/rcss" href="res/rml/window.rcss" />
</head>
<body>
<window id="window">
<window id="window" class="small preset">
<div id="preset-dialog" class="preset-dialog"></div>
</window>
</body>
@@ -88,8 +88,8 @@ PresetWindow::PresetWindow()
auto* intro = createElement(dialog, "div");
intro->SetClass("preset-intro", true);
intro->SetInnerRML(
"Choose a preset to get started. "
"You can change any setting later from the Enhancements menu.");
"Choose a preset to get started.<br/>"
"You can change any setting later from the Settings menu.");
auto* grid = createElement(dialog, "div");
grid->SetClass("preset-grid", true);
@@ -102,11 +102,11 @@ PresetWindow::PresetWindow()
static constexpr PresetInfo kPresets[] = {
{"Classic",
"All enhancements disabled to match the GameCube version. "
"Enhancements disabled to match the GameCube version. "
"Good for speedrunning or simple nostalgia!",
applyPresetClassic},
{"Dusk",
"Graphical enhancements & quality of life tweaks. "
"Graphics & quality of life tweaks, including some from the Wii U version. "
"Our recommended way to play!",
applyPresetDusk},
};
@@ -131,7 +131,7 @@ PresetWindow::PresetWindow()
auto* desc = createElement(col, "div");
desc->SetClass("preset-desc", true);
desc->SetInnerRML(escape(preset.desc));
desc->SetInnerRML(preset.desc);
}
}
@@ -151,7 +151,7 @@ bool PresetWindow::visible() const {
bool PresetWindow::focus() {
if (!mButtons.empty()) {
return mButtons.front()->focus();
return mButtons.back()->focus();
}
return false;
}
src/m_Do/m_Do_main.cpp
+6 -4
View File
@@ -52,15 +52,14 @@
#include "dusk/frame_interpolation.h"
#include "dusk/game_clock.h"
#include "dusk/gyro.h"
#include "dusk/imgui/ImGuiConsole.hpp"
#include "dusk/imgui/ImGuiEngine.hpp"
#include "dusk/logging.h"
#include "dusk/main.h"
#include "dusk/imgui/ImGuiConsole.hpp"
#include "dusk/ui/ui.hpp"
#include "dusk/ui/editor.hpp"
#include "dusk/ui/popup.hpp"
#include "dusk/ui/prelaunch.hpp"
#include "dusk/ui/settings.hpp"
#include "dusk/ui/preset.hpp"
#include "dusk/ui/ui.hpp"
#include "version.h"
#include <aurora/aurora.h>
@@ -634,6 +633,9 @@ int game_main(int argc, char* argv[]) {
}
dusk::ui::push_document(std::make_unique<dusk::ui::Popup>(), false);
if (!dusk::getSettings().backend.wasPresetChosen) {
dusk::ui::push_document(std::make_unique<dusk::ui::PresetWindow>());
}
dusk::version::init();
LanguageInit();