GUI: aaaaaaa

This commit is contained in:
tildearrow 2023-10-15 19:48:20 -05:00
parent c57d5efdfd
commit f44369a09e

View file

@ -513,15 +513,16 @@ void FurnaceGUI::drawPattern() {
if (ImGui::RadioButton("No##_PCS0",patChannelHints==0)) { if (ImGui::RadioButton("No##_PCS0",patChannelHints==0)) {
patChannelHints=0; patChannelHints=0;
} }
if (ImGui::RadioButton("Basic##_PCS0",patChannelHints==1)) { if (ImGui::RadioButton("Yes##_PCS1",patChannelHints==1)) {
patChannelHints=1; patChannelHints=1;
} }
if (ImGui::RadioButton("Regular##_PCS0",patChannelHints==2)) { /*
if (ImGui::RadioButton("Regular##_PCS2",patChannelHints==2)) {
patChannelHints=2; patChannelHints=2;
} }
if (ImGui::RadioButton("Detailed##_PCS0",patChannelHints==3)) { if (ImGui::RadioButton("Detailed##_PCS3",patChannelHints==3)) {
patChannelHints=3; patChannelHints=3;
} }*/
ImGui::Unindent(); ImGui::Unindent();
ImGui::EndPopup(); ImGui::EndPopup();
} }
@ -919,6 +920,10 @@ void FurnaceGUI::drawPattern() {
} }
if (patChannelHints) { if (patChannelHints) {
ImGui::Dummy(ImVec2(dpiScale,settings.iconSize*dpiScale));
//ImDrawList* dl=ImGui::GetWindowDrawList();
/*
DivChannelState* cs=e->getChanState(i); DivChannelState* cs=e->getChanState(i);
if (cs!=NULL) { if (cs!=NULL) {
ImGui::PushFont(mainFont); ImGui::PushFont(mainFont);
@ -940,76 +945,10 @@ void FurnaceGUI::drawPattern() {
ImGui::PopStyleColor(); ImGui::PopStyleColor();
} }
ImGui::PopFont(); ImGui::PopFont();
if (e->curSubSong->chanCollapse[i]==0) {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_VOLUME_MAX]));
ImGui::Text("%.2X",cs->volume>>8);
ImGui::PopStyleColor();
if (cs->volSpeed!=0) {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_EFFECT_VOLUME]));
ImGui::Text("%+2d",cs->volSpeed/4);
ImGui::PopStyleColor();
} else {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_STATUS_OFF]));
ImGui::Text(" 00");
ImGui::PopStyleColor();
}
if (cs->vibratoDepth>0) {
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]));
ImGui::Text("~%.1X%.1X",cs->vibratoRate,cs->vibratoDepth);
ImGui::PopStyleColor();
} else {
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_STATUS_OFF]));
ImGui::Text("~00");
ImGui::PopStyleColor();
}
/*
if (cs->legato) {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]));
ImGui::Text("=");
ImGui::PopStyleColor();
} else {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_STATUS_OFF]));
ImGui::Text("=");
ImGui::PopStyleColor();
}*/
if (cs->inPorta) {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]));
if (cs->portaNote<-60 || cs->portaNote>=120) {
ImGui::Text("???@%.2X",cs->portaSpeed);
} else {
ImGui::Text("%s@%.2X",noteNames[60+cs->portaNote],cs->portaSpeed);
}
ImGui::PopStyleColor();
} else {
if (cs->portaSpeed>0) {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]));
if (cs->portaNote<60) {
ImGui::Text(" v%.2X ",cs->portaSpeed);
} else {
ImGui::Text(" ^%.2X ",cs->portaSpeed);
}
ImGui::PopStyleColor();
} else {
ImGui::SameLine();
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_STATUS_OFF]));
ImGui::Text(" --- ");
ImGui::PopStyleColor();
}
}
}
} }
*/
// TODO: improve. scale font so it always fits.
} }
chanHeadBottom=ImGui::GetCursorScreenPos().y-ImGui::GetStyle().ItemSpacing.y; chanHeadBottom=ImGui::GetCursorScreenPos().y-ImGui::GetStyle().ItemSpacing.y;
} }