Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Confirm deletions agin #97

Closed
wants to merge 12 commits into from
Closed

Feat: Confirm deletions agin #97

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a3283dc
Start working on confirm dialogue for delete
SnazzyPanda Nov 26, 2023
0f89339
Got the delete confirmation dialogue mostly working
SnazzyPanda Dec 1, 2023
9407e79
Possible fix for crash when deleting last mod
SnazzyPanda Dec 1, 2023
8c287cd
Cleanup test/reference code and fix indentations
SnazzyPanda Dec 1, 2023
aef6b9c
Fix wording on confirmation message and tweak the modal window
SnazzyPanda Dec 1, 2023
f77419b
Remove unnecessary variables
SnazzyPanda Dec 1, 2023
6b3c3a8
Move prompt outside for loop
SnazzyPanda Dec 4, 2023
e2c4d90
Merge branch 'master' into confim-delete-alt
SnazzyPanda Dec 6, 2023
6099e23
Merge branch 'master' into confirm-deletions
SnazzyPanda Dec 7, 2023
4d005dd
Merge branch 'confim-delete-alt' into confirm-deletions
SnazzyPanda Dec 7, 2023
290c6fb
Fix indentation
SnazzyPanda Dec 7, 2023
0a95f3b
Right align the cancel button in the modal window
SnazzyPanda Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 66 additions & 22 deletions Lamp/Control/lampControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ namespace Lamp::Core{
*/
static lampString getFormattedTimeAndDate();


lampHex Colour_SearchHighlight = ImVec4(0.3f, 0.f, 0.3f, 1);
lampHex Colour_ButtonAlt = ImVec4(0.1f, 0.6f, 0.3f, 1);

// an index outside of the loop/object recreation that we can reference for the delete modal (otherwise modal options display for every mod in the ModList)
int deletePos = -1;
/**
* @brief The `lampArchiveDisplayHelper` struct provides helper methods for displaying archives.
*/
Expand Down Expand Up @@ -174,7 +176,7 @@ namespace Lamp::Core{
if (ImGui::InputTextWithHint("##searcher","Type here to search your mods...", lampConfig::getInstance().searchBuffer, 250)) {
lampConfig::getInstance().listHighlight = findClosestMatchPosition();
}

ImGuiTableFlags mod_table_flags = 0;
mod_table_flags |= ImGuiTableFlags_SizingStretchProp;
mod_table_flags |= ImGuiTableFlags_Hideable; // allow hiding coumns via context menu
Expand Down Expand Up @@ -346,29 +348,27 @@ namespace Lamp::Core{
}


ImGui::BeginDisabled((*it)->enabled);
ImGui::BeginDisabled((*it)->enabled);

if (ImGui::Button(("Remove Mod##" + std::to_string(i)).c_str())) {
int deleteResult = std::remove(absolute(path).c_str());
if(deleteResult != 0){
std::cout << "Error deleting file: " << absolute(path).c_str() << "\n Error msg: " << strerror(errno) << "\n";
}
if (ImGui::Button(("Remove Mod##" + std::to_string(i)).c_str())) {
lampControl::getInstance().deletePos = i;
ImGui::OpenPopup("Confirm Deletion");

std::cout << absolute(path).c_str() << std::endl;
ModList.erase(it);
Core::FS::lampIO::saveModList(Lamp::Games::getInstance().currentGame->Ident().ShortHand, ModList,Games::getInstance().currentProfile);
ImGui::EndDisabled(); // fixes a crash when deleting items (when at least 1 mod has been enabled)
break;
}
ImGui::EndDisabled(); // fixes a crash when deleting items (when at least 1 mod has been enabled)
break;
}

if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && (*it)->enabled) {
ImGui::SetTooltip("Only disabled mods can be removed.");
}
if (ImGui::IsItemHovered(ImGuiHoveredFlags_None)) {
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, lampControl::getInstance().Colour_SearchHighlight);
}

ImGui::EndDisabled();



if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && (*it)->enabled) {
ImGui::SetTooltip("Only disabled mods can be removed.");
}
if (ImGui::IsItemHovered(ImGuiHoveredFlags_None)) {
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, lampControl::getInstance().Colour_SearchHighlight);
}

ImGui::EndDisabled();


for (auto ittt = ExtraOptions.begin(); ittt != ExtraOptions.end(); ++ittt) {
Expand All @@ -388,6 +388,50 @@ namespace Lamp::Core{
i++;
}

// Setup centering for the modal window
ImVec2 center = ImGui::GetMainViewport()->GetCenter();
ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
ImGui::SetNextWindowBgAlpha(0.9f); // This doesn't seem to mess anything up, but if it does search for new way to make modal bg more opaque.
if(ImGui::BeginPopupModal("Confirm Deletion", NULL, ImGuiWindowFlags_AlwaysAutoResize)){
auto pendingDelete = ModList.begin() + lampControl::getInstance().deletePos;

std::filesystem::path path((*pendingDelete)->ArchivePath);
std::string delname = path.filename().c_str();

std::string promptMessage = "Are you sure you want to delete: ";
promptMessage.append(delname);
promptMessage.append("?\n\nThis action cannot be undone.");
ImGui::Text(promptMessage.c_str());
ImGui::Separator();

if (ImGui::Button("Delete", ImVec2(120, 0))) {
int deleteResult = std::remove(absolute(path).c_str());
if(deleteResult != 0){
std::cout << "Error deleting file: " << absolute(path).c_str() << "\n Error msg: " << strerror(errno) << "\n";
}

std::cout << absolute(path).c_str() << std::endl;
ModList.erase(pendingDelete);
Core::FS::lampIO::saveModList(Lamp::Games::getInstance().currentGame->Ident().ShortHand, ModList,Games::getInstance().currentProfile);

lampControl::getInstance().deletePos = -1;
ImGui::CloseCurrentPopup();
}
ImGui::SetItemDefaultFocus();
ImGui::SameLine();
// right-align the cancel button to help avoid potential misclicks on the delete button
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 120);
if (ImGui::Button("Cancel", ImVec2(120, 0))) {
// Do nothing
lampControl::getInstance().deletePos = -1;
ImGui::CloseCurrentPopup();
}

ImGui::EndPopup();
} // end delete confirmation modal



ImGui::EndTable();
}
}
Expand Down
Loading