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

Merge pull request #1139 from YohananDiamond/pattern-editor-focus-fix

Browse source 
Fix pattern editor focus when selecting instrument
This commit is contained in:
tildearrow 2023-06-04 12:45:27 -05:00 committed by GitHub
parent 07bebe67e8 169b664837
commit 59062cbe40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/dataList.cpp
View file

@ -287,21 +287,17 @@ void FurnaceGUI::insListItem(int i, int dir, int asset) {
} else { } else {
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]); ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]);
} }
if (ImGui::Selectable(name.c_str(),(i==-1)?(curIns<0 || curIns>=e->song.insLen):(curIns==i))) { bool insReleased=ImGui::Selectable(name.c_str(),(i==-1)?(curIns<0 || curIns>=e->song.insLen):(curIns==i));
bool insPressed=ImGui::IsItemActivated();
if (insReleased || (!insListDir && insPressed)) {
curIns=i; curIns=i;
wavePreviewInit=true; wavePreviewInit=true;
updateFMPreview=true; updateFMPreview=true;
lastAssetType=0; lastAssetType=0;
if (insListDir) nextWindow=GUI_WINDOW_PATTERN; if (settings.insFocusesPattern && patternOpen)
nextWindow=GUI_WINDOW_PATTERN;
} }
if (wantScrollList && curIns==i) ImGui::SetScrollHereY(); if (wantScrollList && curIns==i) ImGui::SetScrollHereY();
if (settings.insFocusesPattern && patternOpen && ImGui::IsItemActivated()) {
if (!insListDir) nextWindow=GUI_WINDOW_PATTERN;
curIns=i;
wavePreviewInit=true;
updateFMPreview=true;
lastAssetType=0;
}
if (ImGui::IsItemHovered() && i>=0 && !mobileUI) { if (ImGui::IsItemHovered() && i>=0 && !mobileUI) {
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]); ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]);
ImGui::SetTooltip("%s",insType); ImGui::SetTooltip("%s",insType);