etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'force-critical-input-trickle' of https://github.com/bbbradsmith/furnace into force-critical-input-trickle

This commit is contained in:
tildearrow 2023-07-27 00:39:20 -05:00
parent 09a3da50eb fd27a41c08
commit afe703faf2
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extern/imgui_patched/imgui.cpp vendored
View File

@ -9574,7 +9574,9 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
}
else if (e->Type == ImGuiInputEventType_Text)
{
bool trickle_fast_inputs = true; // forcing trickle for Text event
// forcing trickle for Text event, but only when interacting with keydown or mouse button
if ((key_changed && trickle_interleaved_keys_and_text) || mouse_button_changed != 0)
break;
// Trickling Rule: Stop processing queued events if keys/mouse have been interacted with
if (trickle_fast_inputs && ((key_changed && trickle_interleaved_keys_and_text) || mouse_button_changed != 0 || mouse_moved || mouse_wheeled))

28
src/gui/gui.cpp
View File

@ -3235,19 +3235,6 @@ void FurnaceGUI::pointUp(int x, int y, int button) {
if (dragMobileEditButton) {
dragMobileEditButton=false;
}
if (selecting) {
if (!selectingFull) cursor=selEnd;
finishSelection();
if (!mobileUI) {
demandScrollX=true;
if (cursor.xCoarse==selStart.xCoarse && cursor.xFine==selStart.xFine && cursor.y==selStart.y &&
cursor.xCoarse==selEnd.xCoarse && cursor.xFine==selEnd.xFine && cursor.y==selEnd.y) {
if (!settings.cursorMoveNoScroll) {
updateScroll(cursor.y);
}
}
}
}
}
void FurnaceGUI::pointMotion(int x, int y, int xrel, int yrel) {
@ -4502,6 +4489,21 @@ bool FurnaceGUI::loop() {
MEASURE(effectList,drawEffectList());
}
// release selection if mouse released
if (ImGui::IsMouseReleased(ImGuiMouseButton_Left) && selecting) {
if (!selectingFull) cursor=selEnd;
finishSelection();
if (!mobileUI) {
demandScrollX=true;
if (cursor.xCoarse==selStart.xCoarse && cursor.xFine==selStart.xFine && cursor.y==selStart.y &&
cursor.xCoarse==selEnd.xCoarse && cursor.xFine==selEnd.xFine && cursor.y==selEnd.y) {
if (!settings.cursorMoveNoScroll) {
updateScroll(cursor.y);
}
}
}
}
activateTutorial(GUI_TUTORIAL_OVERVIEW);
if (inspectorOpen) ImGui::ShowMetricsWindow(&inspectorOpen);

1
src/gui/pattern.cpp
View File

@ -938,6 +938,7 @@ void FurnaceGUI::drawPattern() {
ImGui::TableNextColumn();
}
}
ImGui::EndDisabled();
ImGui::PopStyleVar();
oldRow=curRow;