diff --git a/compile_commands.json b/compile_commands.json index 37d2a0a..5e95284 120000 --- a/compile_commands.json +++ b/compile_commands.json @@ -1 +1 @@ -/home/anon/sda/Personal/Repos/anm2ed/build-minidump-smallcheck/compile_commands.json \ No newline at end of file +/home/anon/sda/Personal/Repos/anm2ed/build/compile_commands.json \ No newline at end of file diff --git a/src/imgui/window/sounds.cpp b/src/imgui/window/sounds.cpp index 0aa9aca..405b8f7 100644 --- a/src/imgui/window/sounds.cpp +++ b/src/imgui/window/sounds.cpp @@ -221,7 +221,7 @@ namespace anm2ed::imgui if (ImGui::Selectable("##Sound Selectable", isSelected, 0, soundChildSize)) { reference = id; - play(sound); + if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) play(sound); } if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) open_directory(sound); if (newSoundId == id) @@ -270,8 +270,6 @@ namespace anm2ed::imgui ImGui::EndChild(); ImGui::PopID(); - - context_menu(); } ImGui::PopStyleVar(); @@ -281,6 +279,8 @@ namespace anm2ed::imgui ImGui::EndChild(); ImGui::PopStyleVar(); + context_menu(); + auto widgetSize = imgui::widget_size_with_row_get(4); imgui::shortcut(manager.chords[SHORTCUT_ADD]); @@ -320,12 +320,12 @@ namespace anm2ed::imgui replace(dialog.path); dialog.reset(); } + + if (imgui::shortcut(manager.chords[SHORTCUT_ADD], shortcut::FOCUSED)) add_open(); + if (imgui::shortcut(manager.chords[SHORTCUT_REMOVE], shortcut::FOCUSED)) remove_unused(); + if (imgui::shortcut(manager.chords[SHORTCUT_COPY], shortcut::FOCUSED)) copy(); + if (imgui::shortcut(manager.chords[SHORTCUT_PASTE], shortcut::FOCUSED)) paste(); } ImGui::End(); - - if (imgui::shortcut(manager.chords[SHORTCUT_ADD], shortcut::FOCUSED)) add_open(); - if (imgui::shortcut(manager.chords[SHORTCUT_REMOVE], shortcut::FOCUSED)) remove_unused(); - if (imgui::shortcut(manager.chords[SHORTCUT_COPY], shortcut::FOCUSED)) copy(); - if (imgui::shortcut(manager.chords[SHORTCUT_PASTE], shortcut::FOCUSED)) paste(); } } diff --git a/src/imgui/window/spritesheets.cpp b/src/imgui/window/spritesheets.cpp index 46b8950..d6c6662 100644 --- a/src/imgui/window/spritesheets.cpp +++ b/src/imgui/window/spritesheets.cpp @@ -322,8 +322,6 @@ namespace anm2ed::imgui ImGui::EndChild(); ImGui::PopID(); - - context_menu(); } ImGui::PopStyleVar(); @@ -332,6 +330,8 @@ namespace anm2ed::imgui ImGui::EndChild(); ImGui::PopStyleVar(); + context_menu(); + auto rowOneWidgetSize = widget_size_with_row_get(3); shortcut(manager.chords[SHORTCUT_ADD]); @@ -378,6 +378,11 @@ namespace anm2ed::imgui if (ImGui::Button(localize.get(BASIC_SAVE), rowTwoWidgetSize)) save(); ImGui::EndDisabled(); ImGui::SetItemTooltip("%s", localize.get(TOOLTIP_SAVE_SPRITESHEETS)); + + if (imgui::shortcut(manager.chords[SHORTCUT_ADD], shortcut::FOCUSED)) add_open(); + if (imgui::shortcut(manager.chords[SHORTCUT_REMOVE], shortcut::FOCUSED)) remove_unused(); + if (imgui::shortcut(manager.chords[SHORTCUT_COPY], shortcut::FOCUSED)) copy(); + if (imgui::shortcut(manager.chords[SHORTCUT_PASTE], shortcut::FOCUSED)) paste(); } ImGui::End(); } diff --git a/src/loader.cpp b/src/loader.cpp index 9be1109..8b20857 100644 --- a/src/loader.cpp +++ b/src/loader.cpp @@ -219,7 +219,6 @@ namespace anm2ed #ifdef _WIN32 windows_minidumps_configure(); - windows_wer_localdumps_configure(); #endif auto windowProperties = SDL_CreateProperties();