otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
tildearrow 2023-07-27 00:39:20 -05:00
commit afe703faf2
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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);