shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes!

Browse Source
This commit is contained in:
shweet
2026-01-12 23:10:10 -05:00
parent 2797a971eb
commit 6cac267998
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compile_commands.json
View File

@@ -1 +1 @@
/home/anon/sda/Personal/Repos/anm2ed/build-minidump-smallcheck/compile_commands.json /home/anon/sda/Personal/Repos/anm2ed/build/compile_commands.json

10
src/imgui/window/sounds.cpp
View File

@@ -221,7 +221,7 @@ namespace anm2ed::imgui
if (ImGui::Selectable("##Sound Selectable", isSelected, 0, soundChildSize)) if (ImGui::Selectable("##Sound Selectable", isSelected, 0, soundChildSize))
{ {
reference = id; reference = id;
play(sound); if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) play(sound);
} }
if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) open_directory(sound); if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) open_directory(sound);
if (newSoundId == id) if (newSoundId == id)
@@ -270,8 +270,6 @@ namespace anm2ed::imgui
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopID(); ImGui::PopID();
context_menu();
} }
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -281,6 +279,8 @@ namespace anm2ed::imgui
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
context_menu();
auto widgetSize = imgui::widget_size_with_row_get(4); auto widgetSize = imgui::widget_size_with_row_get(4);
imgui::shortcut(manager.chords[SHORTCUT_ADD]); imgui::shortcut(manager.chords[SHORTCUT_ADD]);
@@ -320,12 +320,12 @@ namespace anm2ed::imgui
replace(dialog.path); replace(dialog.path);
dialog.reset(); dialog.reset();
} }
}
ImGui::End();
if (imgui::shortcut(manager.chords[SHORTCUT_ADD], shortcut::FOCUSED)) add_open(); 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_REMOVE], shortcut::FOCUSED)) remove_unused();
if (imgui::shortcut(manager.chords[SHORTCUT_COPY], shortcut::FOCUSED)) copy(); if (imgui::shortcut(manager.chords[SHORTCUT_COPY], shortcut::FOCUSED)) copy();
if (imgui::shortcut(manager.chords[SHORTCUT_PASTE], shortcut::FOCUSED)) paste(); if (imgui::shortcut(manager.chords[SHORTCUT_PASTE], shortcut::FOCUSED)) paste();
} }
ImGui::End();
}
} }

9
src/imgui/window/spritesheets.cpp
View File

@@ -322,8 +322,6 @@ namespace anm2ed::imgui
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopID(); ImGui::PopID();
context_menu();
} }
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -332,6 +330,8 @@ namespace anm2ed::imgui
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
context_menu();
auto rowOneWidgetSize = widget_size_with_row_get(3); auto rowOneWidgetSize = widget_size_with_row_get(3);
shortcut(manager.chords[SHORTCUT_ADD]); shortcut(manager.chords[SHORTCUT_ADD]);
@@ -378,6 +378,11 @@ namespace anm2ed::imgui
if (ImGui::Button(localize.get(BASIC_SAVE), rowTwoWidgetSize)) save(); if (ImGui::Button(localize.get(BASIC_SAVE), rowTwoWidgetSize)) save();
ImGui::EndDisabled(); ImGui::EndDisabled();
ImGui::SetItemTooltip("%s", localize.get(TOOLTIP_SAVE_SPRITESHEETS)); 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(); ImGui::End();
} }

1
src/loader.cpp
View File

@@ -219,7 +219,6 @@ namespace anm2ed
#ifdef _WIN32 #ifdef _WIN32
windows_minidumps_configure(); windows_minidumps_configure();
windows_wer_localdumps_configure();
#endif #endif
auto windowProperties = SDL_CreateProperties(); auto windowProperties = SDL_CreateProperties();