GUI: new pattern cursor logic, part 13
find/replace and some other places I've missed
This commit is contained in:
parent
0bbdfa877e
commit
1c7f71ffaa
|
@ -105,6 +105,8 @@ void FurnaceGUI::doFind() {
|
||||||
if (curQueryRangeY==1) {
|
if (curQueryRangeY==1) {
|
||||||
finishSelection();
|
finishSelection();
|
||||||
|
|
||||||
|
firstOrder=selStart.order;
|
||||||
|
lastOrder=selEnd.order;
|
||||||
firstRow=selStart.y;
|
firstRow=selStart.y;
|
||||||
lastRow=selEnd.y;
|
lastRow=selEnd.y;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5009,8 +5009,8 @@ bool FurnaceGUI::loop() {
|
||||||
finishSelection();
|
finishSelection();
|
||||||
if (!mobileUI) {
|
if (!mobileUI) {
|
||||||
demandScrollX=true;
|
demandScrollX=true;
|
||||||
if (cursor.xCoarse==selStart.xCoarse && cursor.xFine==selStart.xFine && cursor.y==selStart.y &&
|
if (cursor.xCoarse==selStart.xCoarse && cursor.xFine==selStart.xFine && cursor.y==selStart.y && cursor.order==selStart.order &&
|
||||||
cursor.xCoarse==selEnd.xCoarse && cursor.xFine==selEnd.xFine && cursor.y==selEnd.y) {
|
cursor.xCoarse==selEnd.xCoarse && cursor.xFine==selEnd.xFine && cursor.y==selEnd.y && cursor.order==selEnd.order) {
|
||||||
if (!settings.cursorMoveNoScroll) {
|
if (!settings.cursorMoveNoScroll) {
|
||||||
updateScroll(cursor.y);
|
updateScroll(cursor.y);
|
||||||
}
|
}
|
||||||
|
|
|
@ -423,7 +423,7 @@ void FurnaceGUI::drawPattern() {
|
||||||
if (e->isStepping()) pendingStepUpdate=1;
|
if (e->isStepping()) pendingStepUpdate=1;
|
||||||
cursor.y=oldRow;
|
cursor.y=oldRow;
|
||||||
cursor.order=curOrder;
|
cursor.order=curOrder;
|
||||||
if (selStart.xCoarse==selEnd.xCoarse && selStart.xFine==selEnd.xFine && selStart.y==selEnd.y && !selecting) {
|
if (selStart.xCoarse==selEnd.xCoarse && selStart.xFine==selEnd.xFine && selStart.y==selEnd.y && selStart.order==selEnd.order && !selecting) {
|
||||||
selStart=cursor;
|
selStart=cursor;
|
||||||
selEnd=cursor;
|
selEnd=cursor;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue