mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-27 17:02:55 -04:00
Revert hide change to popup menu
This commit is contained in:
@@ -75,15 +75,6 @@ bool has_menu_chord_part_held(u32 port) noexcept {
|
||||
return (held & (PAD_TRIGGER_R | PAD_BUTTON_START)) != 0;
|
||||
}
|
||||
|
||||
bool should_block_pad_for_menu_chord() noexcept {
|
||||
for (u32 port = 0; port < sPadHoldMasks.size(); ++port) {
|
||||
if (sMenuChordConsumed[port] && has_menu_chord_part_held(port)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const char* controller_change_type(Uint32 eventType) noexcept {
|
||||
switch (eventType) {
|
||||
case SDL_EVENT_GAMEPAD_ADDED:
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
#include "Z2AudioLib/Z2SeMgr.h"
|
||||
#include "m_Do/m_Do_audio.h"
|
||||
|
||||
#include "achievements.hpp"
|
||||
#include "aurora/rmlui.hpp"
|
||||
#include "dusk/main.h"
|
||||
#include "dusk/settings.h"
|
||||
#include "editor.hpp"
|
||||
#include "f_pc/f_pc_manager.h"
|
||||
#include "f_pc/f_pc_name.h"
|
||||
#include "achievements.hpp"
|
||||
#include "editor.hpp"
|
||||
#include "imgui.h"
|
||||
#include "settings.hpp"
|
||||
#include "ui.hpp"
|
||||
@@ -58,12 +58,12 @@ Popup::Popup() : Document(kDocumentSource), mRoot(mDocument->GetElementById("pop
|
||||
});
|
||||
mTabBar->add_tab("Quit", [] { IsRunning = false; });
|
||||
|
||||
|
||||
// Hide document after transition completion
|
||||
listen(mRoot, Rml::EventId::Transitionend, [this](Rml::Event& event) {
|
||||
if (event.GetTargetElement() == mRoot && !mRoot->HasAttribute("open") &&
|
||||
Document::visible() && mPendingClose)
|
||||
Document::visible())
|
||||
{
|
||||
Document::hide(true);
|
||||
Document::hide(mPendingClose);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user