Compare commits

...

3 Commits

Author SHA1 Message Date
tildearrow ec4063641a GUI: fix sample preview needle visible when switch
ing samples
2023-09-05 15:38:02 -05:00
tildearrow 803c8b0582 GUI: update intro
ticket #1453
2023-09-05 15:31:27 -05:00
tildearrow fc760eed43 GUI: fix cut off text in settings 2023-09-05 15:30:53 -05:00
5 changed files with 12083 additions and 12163 deletions

View File

@ -2016,6 +2016,10 @@ bool DivEngine::isPreviewingSample() {
return (sPreview.sample>=0 && sPreview.sample<(int)song.sample.size()); return (sPreview.sample>=0 && sPreview.sample<(int)song.sample.size());
} }
int DivEngine::getSamplePreviewSample() {
return sPreview.sample;
}
int DivEngine::getSamplePreviewPos() { int DivEngine::getSamplePreviewPos() {
return sPreview.pos; return sPreview.pos;
} }

View File

@ -714,6 +714,7 @@ class DivEngine {
// sample preview query // sample preview query
bool isPreviewingSample(); bool isPreviewingSample();
int getSamplePreviewSample();
int getSamplePreviewPos(); int getSamplePreviewPos();
double getSamplePreviewRate(); double getSamplePreviewRate();

File diff suppressed because it is too large Load Diff

View File

@ -1676,7 +1676,7 @@ void FurnaceGUI::drawSampleEdit() {
} }
dl->PushClipRect(rectMin,rectMax); dl->PushClipRect(rectMin,rectMax);
if (e->isPreviewingSample()) { if (e->isPreviewingSample() && e->getSamplePreviewSample()==curSample) {
if (!statusBar2.empty()) { if (!statusBar2.empty()) {
statusBar2+=" | "; statusBar2+=" | ";
} }

View File

@ -1074,9 +1074,7 @@ void FurnaceGUI::drawSettings() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("Action"); ImGui::Text("Action");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("Learn");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("Remove");
for (size_t i=0; i<midiMap.binds.size(); i++) { for (size_t i=0; i<midiMap.binds.size(); i++) {
MIDIBind& bind=midiMap.binds[i]; MIDIBind& bind=midiMap.binds[i];
@ -1178,13 +1176,15 @@ void FurnaceGUI::drawSettings() {
} }
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (ImGui::Button((learning==(int)i)?("waiting...##BLearn"):(ICON_FA_SQUARE_O "##BLearn"))) { pushToggleColors(learning==(int)i);
if (ImGui::Button((learning==(int)i)?("waiting...##BLearn"):("Learn##BLearn"))) {
if (learning==(int)i) { if (learning==(int)i) {
learning=-1; learning=-1;
} else { } else {
learning=i; learning=i;
} }
} }
popToggleColors();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (ImGui::Button(ICON_FA_TIMES "##BRemove")) { if (ImGui::Button(ICON_FA_TIMES "##BRemove")) {