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

GUI: chip manager redesign, part 3

Browse source
This commit is contained in:
tildearrow 2025-09-16 06:27:34 -05:00
parent d38b956030
commit 72b94b029a
3 changed files with 25 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.h
View file

@ -2974,7 +2974,7 @@ class FurnaceGUI {
void drawTutorial(); void drawTutorial();
void drawXYOsc(); void drawXYOsc();
void drawUserPresets(); void drawUserPresets();
void drawSystemChannelInfo(const DivSysDef* whichDef, int keyHitOffset=-1); void drawSystemChannelInfo(const DivSysDef* whichDef, int keyHitOffset=-1, float width=-1.0f);
void drawSystemChannelInfoText(const DivSysDef* whichDef); void drawSystemChannelInfoText(const DivSysDef* whichDef);
void assignActionMap(std::map<int,int>& actionMap, int first, int last); void assignActionMap(std::map<int,int>& actionMap, int first, int last);

146
src/gui/sysManager.cpp
View file

@ -46,6 +46,7 @@ void FurnaceGUI::drawSysManager() {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Checkbox(_("Clone at end"),&sysDupEnd); ImGui::Checkbox(_("Clone at end"),&sysDupEnd);
// this is a "rack" style chip list
int dispatchOff=0; int dispatchOff=0;
for (int i=0; i<e->song.systemLen; i++) { for (int i=0; i<e->song.systemLen; i++) {
String rackID=fmt::sprintf("SysEntry%d",i); String rackID=fmt::sprintf("SysEntry%d",i);
@ -54,6 +55,7 @@ void FurnaceGUI::drawSysManager() {
ImGui::PushID(i); ImGui::PushID(i);
if (ImGui::BeginChild(rackID.c_str(),ImVec2(0,0),ImGuiChildFlags_Border|ImGuiChildFlags_AutoResizeY)) { if (ImGui::BeginChild(rackID.c_str(),ImVec2(0,0),ImGuiChildFlags_Border|ImGuiChildFlags_AutoResizeY)) {
// swap handle and name
if (ImGui::Button(ICON_FA_ARROWS)) { if (ImGui::Button(ICON_FA_ARROWS)) {
} }
if (ImGui::BeginDragDropSource()) { if (ImGui::BeginDragDropSource()) {
@ -78,11 +80,12 @@ void FurnaceGUI::drawSysManager() {
ImGui::EndDragDropTarget(); ImGui::EndDragDropTarget();
} }
ImGui::SameLine(); ImGui::SameLine();
float buttonInnerSize=ImGui::CalcTextSize(ICON_FA_CLONE ICON_FA_EJECT ICON_FA_TIMES).x; float buttonInnerSize=ImGui::CalcTextSize(ICON_FA_CLONE).x;
float sideButtonSize=ImGui::GetStyle().ItemSpacing.x*3.0f+buttonInnerSize+ImGui::GetStyle().ItemInnerSpacing.x*6; float sideButtonSize=ImGui::GetStyle().ItemSpacing.x*3.0f+buttonInnerSize*3.0f+ImGui::GetStyle().FramePadding.x*6;
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
ImGui::ScrollText(ImGui::GetID(rackNameID.c_str()),sysDef->name,ImVec2(0.0f,0.0f),ImVec2(ImGui::GetContentRegionAvail().x-sideButtonSize,0)); ImGui::ScrollText(ImGui::GetID(rackNameID.c_str()),sysDef->name,ImVec2(0.0f,0.0f),ImVec2(ImGui::GetContentRegionAvail().x-sideButtonSize,0));
ImGui::Dummy(ImVec2(ImGui::GetContentRegionAvail().x-sideButtonSize,1.0f)); ImGui::Dummy(ImVec2(ImGui::GetContentRegionAvail().x-sideButtonSize,1.0f));
// action buttons
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_CLONE "##SysDup")) { if (ImGui::Button(ICON_FA_CLONE "##SysDup")) {
if (!e->duplicateSystem(i,sysDupCloneChannels,sysDupEnd)) { if (!e->duplicateSystem(i,sysDupCloneChannels,sysDupEnd)) {
@ -95,7 +98,8 @@ void FurnaceGUI::drawSysManager() {
updateROMExportAvail(); updateROMExportAvail();
MARK_MODIFIED; MARK_MODIFIED;
} }
}if (ImGui::IsItemHovered()) { }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(_("Clone")); ImGui::SetTooltip(_("Clone"));
} }
ImGui::SameLine(); ImGui::SameLine();
@ -136,29 +140,31 @@ void FurnaceGUI::drawSysManager() {
} }
ImGui::EndDisabled(); ImGui::EndDisabled();
drawSystemChannelInfo(sysDef,dispatchOff); // channel LEDs and chip config button
drawSystemChannelInfo(sysDef,dispatchOff,ImGui::GetContentRegionAvail().x-(ImGui::CalcTextSize(ICON_FA_CHEVRON_DOWN).x+ImGui::GetStyle().FramePadding.x*2.0f+ImGui::GetStyle().ItemSpacing.x));
ImGui::Separator();
ImGuiID openedID=ImGui::GetID("OpenSysConfig"); ImGuiID openedID=ImGui::GetID("OpenSysConfig");
bool opened=openedConfig->GetBool(openedID,false); bool opened=openedConfig->GetBool(openedID,false);
if (opened) { ImGui::SameLine();
ImGui::Indent();
drawSysConf(i,i,e->song.system[i],e->song.systemFlags[i],true);
ImGui::Unindent();
}
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize,0.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize,0.0f);
ImGui::PushStyleVar(ImGuiStyleVar_FrameShading,0.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameShading,0.0f);
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding,0.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding,0.0f);
ImGui::PushStyleColor(ImGuiCol_Button,0); ImGui::PushStyleColor(ImGuiCol_Button,0);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered,ImGui::GetColorU32(uiColors[GUI_COLOR_SCROLL])); ImGui::PushStyleColor(ImGuiCol_ButtonHovered,ImGui::GetColorU32(uiColors[GUI_COLOR_SCROLL]));
ImGui::PushStyleColor(ImGuiCol_ButtonActive,ImGui::GetColorU32(uiColors[GUI_COLOR_SCROLL_ACTIVE])); ImGui::PushStyleColor(ImGuiCol_ButtonActive,ImGui::GetColorU32(uiColors[GUI_COLOR_SCROLL_ACTIVE]));
if (ImGui::Button(opened?(ICON_FA_CHEVRON_UP " " ICON_FA_CHEVRON_UP " " ICON_FA_CHEVRON_UP " " "###OpenThing"):(ICON_FA_CHEVRON_DOWN " " ICON_FA_CHEVRON_DOWN " " ICON_FA_CHEVRON_DOWN " " "###OpenThing"),ImVec2(ImGui::GetContentRegionAvail().x,0.0f))) { if (ImGui::SmallButton(opened?(ICON_FA_CHEVRON_UP "###OpenThing"):(ICON_FA_CHEVRON_DOWN "###OpenThing"))) {
opened=!opened; opened=!opened;
openedConfig->SetBool(openedID,opened); openedConfig->SetBool(openedID,opened);
} }
ImGui::PopStyleColor(3); ImGui::PopStyleColor(3);
ImGui::PopStyleVar(3); ImGui::PopStyleVar(3);
if (opened) {
ImGui::Separator();
ImGui::Indent();
drawSysConf(i,i,e->song.system[i],e->song.systemFlags[i],true);
ImGui::Unindent();
}
} }
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopID(); ImGui::PopID();
@ -189,122 +195,6 @@ void FurnaceGUI::drawSysManager() {
ImGui::EndPopup(); ImGui::EndPopup();
} }
} }
/*
if (ImGui::BeginTable("SystemList",3)) {
ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch);
ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed);
ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
ImGui::TableNextColumn();
ImGui::TableNextColumn();
ImGui::Text(_("Name"));
ImGui::TableNextColumn();
ImGui::Text(_("Actions"));
for (unsigned char i=0; i<e->song.systemLen; i++) {
ImGui::PushID(i);
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::TableNextColumn();
bool isNotCollapsed=true;
if (ImGui::TreeNode(fmt::sprintf("%d. %s##_SYSM%d",i+1,getSystemName(e->song.system[i]),i).c_str())) {
drawSysConf(i,i,e->song.system[i],e->song.systemFlags[i],true);
isNotCollapsed=false;
ImGui::TreePop();
}
if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary) && isNotCollapsed) {
if (e->song.system[i]!=DIV_SYSTEM_NULL) {
const DivSysDef* sysDef=e->getSystemDef(e->song.system[i]);
if (ImGui::BeginTooltip()) {
ImGui::Dummy(ImVec2(MIN(scrW*dpiScale,400.0f*dpiScale),0.0f));
ImGui::PushTextWrapPos(MIN(scrW*dpiScale,400.0f*dpiScale)); // arbitrary constant
ImGui::TextWrapped("%s",sysDef->description);
ImGui::Separator();
drawSystemChannelInfoText(sysDef);
drawSystemChannelInfo(sysDef);
ImGui::PopTextWrapPos();
ImGui::EndTooltip();
}
}
}
ImGui::TableNextColumn();
if (ImGui::Button(_("Clone##SysDup"))) {
if (!e->duplicateSystem(i,sysDupCloneChannels,sysDupEnd)) {
showError(fmt::sprintf(_("cannot clone chip! (%s)"),e->getLastError()));
} else {
if (e->song.autoSystem) {
autoDetectSystem();
updateWindowTitle();
}
updateROMExportAvail();
MARK_MODIFIED;
}
}
ImGui::SameLine();
ImGui::Button(_("Change##SysChange"));
if (ImGui::BeginPopupContextItem("SysPickerC",ImGuiPopupFlags_MouseButtonLeft)) {
DivSystem picked=systemPicker(false);
if (picked!=DIV_SYSTEM_NULL) {
if (e->changeSystem(i,picked,preserveChanPos)) {
MARK_MODIFIED;
if (e->song.autoSystem) {
autoDetectSystem();
}
updateWindowTitle();
updateROMExportAvail();
} else {
showError(fmt::sprintf(_("cannot change chip! (%s)"),e->getLastError()));
}
ImGui::CloseCurrentPopup();
}
if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();
}
ImGui::SameLine();
ImGui::BeginDisabled(e->song.systemLen<=1);
pushDestColor();
if (ImGui::Button(ICON_FA_TIMES "##SysRemove")) {
sysToDelete=i;
showWarning(_("Are you sure you want to remove this chip?"),GUI_WARN_SYSTEM_DEL);
}
popDestColor();
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(_("Remove"));
}
ImGui::EndDisabled();
ImGui::PopID();
}
if (e->song.systemLen<DIV_MAX_CHIPS) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::TableNextColumn();
ImGui::Button(ICON_FA_PLUS "##SysAdd");
if (ImGui::BeginPopupContextItem("SysPickerA",ImGuiPopupFlags_MouseButtonLeft)) {
DivSystem picked=systemPicker(false);
if (picked!=DIV_SYSTEM_NULL) {
if (!e->addSystem(picked)) {
showError(fmt::sprintf(_("cannot add chip! (%s)"),e->getLastError()));
} else {
MARK_MODIFIED;
}
if (e->song.autoSystem) {
autoDetectSystem();
}
updateWindowTitle();
updateROMExportAvail();
ImGui::CloseCurrentPopup();
}
if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();
}
}
ImGui::EndTable();
}
*/
} }
if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SYS_MANAGER; if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SYS_MANAGER;
ImGui::End(); ImGui::End();

12
src/gui/sysMiscInfo.cpp
View file

@ -296,19 +296,19 @@ const char* FurnaceGUI::getSystemPartNumber(DivSystem sys, DivConfig& flags) {
} }
} }
void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef, int keyHitOffset) { void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef, int keyHitOffset, float tooltipWidth) {
ImDrawList* dl=ImGui::GetWindowDrawList(); ImDrawList* dl=ImGui::GetWindowDrawList();
const ImVec2 p=ImGui::GetCursorScreenPos(); const ImVec2 p=ImGui::GetCursorScreenPos();
if (tooltipWidth<=0.0f) tooltipWidth=ImGui::GetContentRegionAvail().x;
ImVec2 sep=ImGui::GetStyle().ItemSpacing; ImVec2 sep=ImGui::GetStyle().ItemSpacing;
ImVec2 ledSize=ImVec2( ImVec2 ledSize=ImVec2(
(ImGui::GetContentRegionAvail().x-sep.x*(whichDef->channels-1))/(float)whichDef->channels, (tooltipWidth-sep.x*(whichDef->channels-1))/(float)whichDef->channels,
8.0f*dpiScale 8.0f*dpiScale
); );
if (ledSize.x<7.5f*dpiScale) ledSize.x=7.5f*dpiScale; if (ledSize.x<8.0f*dpiScale) ledSize.x=8.0f*dpiScale;
float x=p.x, y=p.y; float x=p.x, y=p.y;
float tooltipWidth=ImGui::GetContentRegionAvail().x;
for (int i=0; i<whichDef->channels; i++) { for (int i=0; i<whichDef->channels; i++) {
if (x>tooltipWidth+p.x) { if (x+ledSize.x-0.125>tooltipWidth+p.x) {
x=p.x; x=p.x;
y+=ledSize.y+sep.y; y+=ledSize.y+sep.y;
} }
@ -328,7 +328,7 @@ void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef, int keyHitOffs
dl->AddRectFilled(ImVec2(x,y),ImVec2(x+ledSize.x,y+ledSize.y),ImGui::GetColorU32(color),ledSize.y); dl->AddRectFilled(ImVec2(x,y),ImVec2(x+ledSize.x,y+ledSize.y),ImGui::GetColorU32(color),ledSize.y);
x+=ledSize.x+sep.x; x+=ledSize.x+sep.x;
} }
ImGui::Dummy(ImVec2(0,(y-p.y)+ledSize.y)); ImGui::Dummy(ImVec2(tooltipWidth,(y-p.y)+ledSize.y));
} }
void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) { void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {