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

GUI: separate current order from engine order

Browse source 
fixes #105
This commit is contained in:
tildearrow 2022-04-14 02:58:29 -05:00
parent 9795bca2ca
commit 55e085b148
8 changed files with 70 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gui/orders.cpp
View file

@ -47,10 +47,9 @@ void FurnaceGUI::drawOrders() {
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,prevSpacing);
ImGui::TableSetupScrollFreeze(1,1);
float lineHeight=(ImGui::GetTextLineHeight()+4*dpiScale);
int curOrder=e->getOrder();
if (e->isPlaying()) {
if (followOrders) {
ImGui::SetScrollY((curOrder+1)*lineHeight-(ImGui::GetContentRegionAvail().y/2));
ImGui::SetScrollY((e->getOrder()+1)*lineHeight-(ImGui::GetContentRegionAvail().y/2));
}
}
ImGui::TableNextRow(0,lineHeight);
@ -75,7 +74,7 @@ void FurnaceGUI::drawOrders() {
snprintf(selID,4096,"%d##O_S%.2x",i,i);
}
if (ImGui::Selectable(selID)) {
e->setOrder(i);
setOrder(i);
curNibble=false;
orderCursor=-1;
@ -115,7 +114,7 @@ void FurnaceGUI::drawOrders() {
curNibble=false;
}
} else {
e->setOrder(i);
setOrder(i);
e->walkSong(loopOrder,loopRow,loopEnd);
if (orderEditMode!=0) {
orderCursor=j;
@ -151,7 +150,7 @@ void FurnaceGUI::drawOrders() {
curNibble=false;
}
} else {
e->setOrder(i);
setOrder(i);
e->walkSong(loopOrder,loopRow,loopEnd);
if (orderEditMode!=0) {
orderCursor=j;