Addressing comments

This commit is contained in:
cam900 2022-12-11 11:09:13 +09:00
parent c561ceceaf
commit 592bf34bf3
6 changed files with 12 additions and 42 deletions

View file

@ -95,7 +95,7 @@ void FurnaceGUI::drawInsList(bool asChild) {
if (!settings.unifiedDataView) doAction(GUI_ACTION_INS_LIST_OPEN); if (!settings.unifiedDataView) doAction(GUI_ACTION_INS_LIST_OPEN);
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Load"); ImGui::SetTooltip("Open");
} }
if (settings.unifiedDataView) { if (settings.unifiedDataView) {
if (ImGui::BeginPopupContextItem("UnifiedLoad",ImGuiMouseButton_Left)) { if (ImGui::BeginPopupContextItem("UnifiedLoad",ImGuiMouseButton_Left)) {
@ -557,7 +557,7 @@ void FurnaceGUI::drawWaveList(bool asChild) {
doAction(GUI_ACTION_WAVE_LIST_OPEN); doAction(GUI_ACTION_WAVE_LIST_OPEN);
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Load"); ImGui::SetTooltip("Open");
} }
if (ImGui::BeginPopupContextItem("WaveOpenOpt")) { if (ImGui::BeginPopupContextItem("WaveOpenOpt")) {
if (ImGui::MenuItem("replace...")) { if (ImGui::MenuItem("replace...")) {
@ -655,7 +655,7 @@ void FurnaceGUI::drawSampleList(bool asChild) {
doAction(GUI_ACTION_SAMPLE_LIST_OPEN); doAction(GUI_ACTION_SAMPLE_LIST_OPEN);
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Load"); ImGui::SetTooltip("Open");
} }
if (ImGui::BeginPopupContextItem("SampleOpenOpt")) { if (ImGui::BeginPopupContextItem("SampleOpenOpt")) {
if (ImGui::MenuItem("replace...")) { if (ImGui::MenuItem("replace...")) {

View file

@ -205,7 +205,7 @@ void FurnaceGUI::drawMobileControls() {
pendingStepUpdate=true; pendingStepUpdate=true;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Step 1 row"); ImGui::SetTooltip("Step one row");
} }
bool repeatPattern=e->getRepeatPattern(); bool repeatPattern=e->getRepeatPattern();
@ -498,7 +498,7 @@ void FurnaceGUI::drawEditControls() {
pendingStepUpdate=true; pendingStepUpdate=true;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Step 1 row"); ImGui::SetTooltip("Step one row");
} }
ImGui::SameLine(); ImGui::SameLine();
@ -538,7 +538,7 @@ void FurnaceGUI::drawEditControls() {
pendingStepUpdate=true; pendingStepUpdate=true;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Step 1 row"); ImGui::SetTooltip("Step one row");
} }
ImGui::SameLine(); ImGui::SameLine();
@ -643,7 +643,7 @@ void FurnaceGUI::drawEditControls() {
pendingStepUpdate=true; pendingStepUpdate=true;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Step 1 row"); ImGui::SetTooltip("Step one row");
} }
bool repeatPattern=e->getRepeatPattern(); bool repeatPattern=e->getRepeatPattern();
@ -777,7 +777,7 @@ void FurnaceGUI::drawEditControls() {
pendingStepUpdate=true; pendingStepUpdate=true;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Step 1 row"); ImGui::SetTooltip("Step one row");
} }
ImGui::SameLine(); ImGui::SameLine();

View file

@ -2167,7 +2167,7 @@ void FurnaceGUI::drawInsEdit() {
doAction(GUI_ACTION_INS_LIST_OPEN_REPLACE); doAction(GUI_ACTION_INS_LIST_OPEN_REPLACE);
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Load"); ImGui::SetTooltip("Open");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_FLOPPY_O "##IESave")) { if (ImGui::Button(ICON_FA_FLOPPY_O "##IESave")) {

View file

@ -78,37 +78,25 @@ void FurnaceGUI::drawPiano() {
if (ImGui::Button("OFF##PianoNOff",optionSize)) { if (ImGui::Button("OFF##PianoNOff",optionSize)) {
if (edit) noteInput(0,GUI_NOTE_OFF); if (edit) noteInput(0,GUI_NOTE_OFF);
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Note Off");
}
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("===##PianoNRel",optionSize)) { if (ImGui::Button("===##PianoNRel",optionSize)) {
if (edit) noteInput(0,GUI_NOTE_OFF_RELEASE); if (edit) noteInput(0,GUI_NOTE_OFF_RELEASE);
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Note Off + Release");
}
} else { } else {
if (ImGui::Button(ICON_FA_ARROW_LEFT "##PianoLeft",optionSize)) { if (ImGui::Button(ICON_FA_ARROW_LEFT "##PianoLeft",optionSize)) {
off--; off--;
if (off<0) off=0; if (off<0) off=0;
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Left scroll");
}
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_ARROW_RIGHT "##PianoRight",optionSize)) { if (ImGui::Button(ICON_FA_ARROW_RIGHT "##PianoRight",optionSize)) {
off++; off++;
if ((off+oct)>14) off=15-oct; if ((off+oct)>14) off=15-oct;
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Right scroll");
}
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::Button(ICON_FA_ELLIPSIS_V "##PianoOptions",optionSize); ImGui::Button(ICON_FA_ELLIPSIS_V "##PianoOptions",optionSize);
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Piano Options"); ImGui::SetTooltip("Options");
} }
if (ImGui::BeginPopupContextItem("PianoOptions",ImGuiPopupFlags_MouseButtonLeft)) { if (ImGui::BeginPopupContextItem("PianoOptions",ImGuiPopupFlags_MouseButtonLeft)) {
ImGui::Text("Key layout:"); ImGui::Text("Key layout:");
@ -146,41 +134,26 @@ void FurnaceGUI::drawPiano() {
if (ImGui::Button("REL##PianoNMRel",optionSize)) { if (ImGui::Button("REL##PianoNMRel",optionSize)) {
if (edit) noteInput(0,GUI_NOTE_RELEASE); if (edit) noteInput(0,GUI_NOTE_RELEASE);
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Note Release");
}
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_TIMES "##PianoDelP",optionSize)) { if (ImGui::Button(ICON_FA_TIMES "##PianoDelP",optionSize)) {
doDelete(); doDelete();
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Note Delete");
}
} else { } else {
if (ImGui::Button(ICON_FA_MINUS "##PianoOctaveDown",optionSize)) { if (ImGui::Button(ICON_FA_MINUS "##PianoOctaveDown",optionSize)) {
oct--; oct--;
if (oct<1) oct=1; if (oct<1) oct=1;
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Octave down");
}
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_PLUS "##PianoOctaveUp",optionSize)) { if (ImGui::Button(ICON_FA_PLUS "##PianoOctaveUp",optionSize)) {
oct++; oct++;
if (oct>15) oct=15; if (oct>15) oct=15;
if ((off+oct)>14) off=15-oct; if ((off+oct)>14) off=15-oct;
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Octave up");
}
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_ELLIPSIS_H "##PianoSel",optionSize)) { if (ImGui::Button(ICON_FA_ELLIPSIS_H "##PianoSel",optionSize)) {
pianoOptionsSet=!pianoOptionsSet; pianoOptionsSet=!pianoOptionsSet;
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(pianoOptionsSet?"Note Off/Release":"Scroll/Resize Piano");
}
} }
if (mobileUI && portrait) { if (mobileUI && portrait) {
@ -510,9 +483,6 @@ void FurnaceGUI::drawPiano() {
if (ImGui::Button(ICON_FA_TIMES "##PianoDel",buttonSize)) { if (ImGui::Button(ICON_FA_TIMES "##PianoDel",buttonSize)) {
doDelete(); doDelete();
} }
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Delete");
}
ImGui::TableNextColumn(); ImGui::TableNextColumn();
VALUE_DIGIT(0,"0"); VALUE_DIGIT(0,"0");
ImGui::TableNextColumn(); ImGui::TableNextColumn();

View file

@ -119,7 +119,7 @@ void FurnaceGUI::drawSampleEdit() {
doAction(GUI_ACTION_SAMPLE_LIST_OPEN_REPLACE); doAction(GUI_ACTION_SAMPLE_LIST_OPEN_REPLACE);
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Load"); ImGui::SetTooltip("Open");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_FLOPPY_O "##SESave")) { if (ImGui::Button(ICON_FA_FLOPPY_O "##SESave")) {

View file

@ -242,7 +242,7 @@ void FurnaceGUI::drawWaveEdit() {
doAction(GUI_ACTION_WAVE_LIST_OPEN_REPLACE); doAction(GUI_ACTION_WAVE_LIST_OPEN_REPLACE);
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Load"); ImGui::SetTooltip("Open");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(ICON_FA_FLOPPY_O "##WESave")) { if (ImGui::Button(ICON_FA_FLOPPY_O "##WESave")) {