mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-10 02:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make RmlUi F1, ImGui Shift+F1

Browse Source
This commit is contained in:
Luke Street
2026-05-01 21:53:48 -06:00
parent ca783b8424
commit 04274b1884
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extern/aurora
Vendored
+1 -1
Submodule extern/aurora updated: 222545580e...1119435dd1
src/dusk/imgui/ImGuiConsole.cpp
+4 -1
View File
@@ -329,7 +329,10 @@ namespace dusk {
}
m_isHidden = !getSettings().backend.duskMenuOpen;
bool showMenu = !dusk::IsGameLaunched || !CheckMenuViewToggle(ImGuiKey_F1, m_isHidden);
if (ImGui::GetIO().KeyShift && ImGui::IsKeyPressed(ImGuiKey_F1)) {
m_isHidden = !m_isHidden;
}
bool showMenu = !dusk::IsGameLaunched || !m_isHidden;
if (dusk::IsGameLaunched) {
const bool menuOpen = !m_isHidden;
if (getSettings().backend.duskMenuOpen != menuOpen) {
src/dusk/ui/document.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ Document::Document(const Rml::String& source) : mDocument(load_document(source))
[this](Rml::Event& event) {
const auto cmd = map_nav_event(event);
if (cmd != NavCommand::Menu && !visible()) {
event.StopPropagation();
event.StopImmediatePropagation();
}
},
true);
src/dusk/ui/input.cpp
+5 -5
View File
@@ -158,7 +158,7 @@ Rml::Input::KeyIdentifier map_raw_gamepad_button(SDL_GamepadButton button) noexc
case SDL_GAMEPAD_BUTTON_SOUTH:
return Rml::Input::KI_RETURN;
case SDL_GAMEPAD_BUTTON_BACK:
return Rml::Input::KI_PAUSE;
return Rml::Input::KI_F1;
case SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER:
return Rml::Input::KI_NEXT;
case SDL_GAMEPAD_BUTTON_LEFT_SHOULDER:
@@ -171,7 +171,7 @@ Rml::Input::KeyIdentifier map_raw_gamepad_button(SDL_GamepadButton button) noexc
Rml::Input::KeyIdentifier map_raw_button_alias(SDL_GamepadButton button) noexcept {
switch (button) {
case SDL_GAMEPAD_BUTTON_BACK:
return Rml::Input::KI_PAUSE;
return Rml::Input::KI_F1;
case SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER:
return Rml::Input::KI_NEXT;
case SDL_GAMEPAD_BUTTON_LEFT_SHOULDER:
@@ -274,7 +274,7 @@ bool find_event_pad_button(
Rml::Input::KeyIdentifier map_gamepad_button(const SDL_GamepadButtonEvent& event) noexcept {
const auto nativeButton = static_cast<SDL_GamepadButton>(event.button);
if (nativeButton == SDL_GAMEPAD_BUTTON_BACK) {
return Rml::Input::KI_PAUSE;
return Rml::Input::KI_F1;
}
u32 port = 0;
@@ -458,7 +458,7 @@ void process_axis_direction(
if (chorded) {
consume_menu_chord(port, context);
}
const auto key = chorded ? Rml::Input::KI_PAUSE : map_gamepad_axis(event, sign);
const auto key = chorded ? Rml::Input::KI_F1 : map_gamepad_axis(event, sign);
if (key == Rml::Input::KI_UNKNOWN) {
return;
}
@@ -532,7 +532,7 @@ void handle_event(const SDL_Event& event) noexcept {
if (chorded) {
consume_menu_chord(port, *context);
}
const auto key = chorded ? Rml::Input::KI_PAUSE : map_gamepad_button(event.gbutton);
const auto key = chorded ? Rml::Input::KI_F1 : map_gamepad_button(event.gbutton);
if (key != Rml::Input::KI_UNKNOWN) {
bool deferred = false;
if (repeat != nullptr) {
src/dusk/ui/popup.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ bool Popup::visible() const {
bool Popup::handle_nav_command(Rml::Event& event, NavCommand cmd) {
if (cmd == NavCommand::Cancel) {
toggle();
hide();
return true;
}
return Document::handle_nav_command(event, cmd);
src/dusk/ui/ui.cpp
+2 -2
View File
@@ -167,8 +167,8 @@ NavCommand map_nav_event(const Rml::Event& event) noexcept {
return NavCommand::Cancel;
case Rml::Input::KeyIdentifier::KI_RETURN:
return NavCommand::Confirm;
case Rml::Input::KeyIdentifier::KI_PAUSE:
return NavCommand::Menu;
case Rml::Input::KeyIdentifier::KI_F1:
return event.GetParameter<int>("shift_key", 0) ? NavCommand::None : NavCommand::Menu;
case Rml::Input::KeyIdentifier::KI_NEXT:
return NavCommand::Next;
case Rml::Input::KeyIdentifier::KI_PRIOR: