mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-12-25 02:18:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Ryzerth 2021-07-09 17:55:17 +02:00
parent cf3c976651
commit 91c6823e0c
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/gui/widgets/menu.cpp
View File

@ -33,10 +33,12 @@ bool Menu::draw(bool updateStates) {
ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiWindow* window = ImGui::GetCurrentWindow();
int id = 0; int id = 0;
int rawId = 0;
ImU32 textColor = ImGui::GetColorU32(ImGuiCol_Text); ImU32 textColor = ImGui::GetColorU32(ImGuiCol_Text);
for (MenuOption_t& opt : order) { for (MenuOption_t& opt : order) {
rawId++;
if (items.find(opt.name) == items.end()) { if (items.find(opt.name) == items.end()) {
continue; continue;
} }
@ -52,7 +54,17 @@ bool Menu::draw(bool updateStates) {
ImVec2 posMin = ImGui::GetCursorScreenPos(); ImVec2 posMin = ImGui::GetCursorScreenPos();
ImVec2 posMax = ImVec2(posMin.x + menuWidth, posMin.y + ImGui::GetFrameHeight()); ImVec2 posMax = ImVec2(posMin.x + menuWidth, posMin.y + ImGui::GetFrameHeight());
style::beginDisabled(); style::beginDisabled();
ImRect orignalRect = window->WorkRect;
ImGui::CollapsingHeader((draggedMenuName + "##sdrpp_main_menu_dragging").c_str()); ImGui::CollapsingHeader((draggedMenuName + "##sdrpp_main_menu_dragging").c_str());
if (items[draggedOpt.name].inst != NULL) {
window->WorkRect = orignalRect;
ImVec2 pos = ImGui::GetCursorPos();
ImGui::SetCursorPosX(pos.x + menuWidth - ImGui::GetTextLineHeight() - 6);
ImGui::SetCursorPosY(pos.y - 10 - ImGui::GetTextLineHeight());
bool enabled = items[draggedOpt.name].inst->isEnabled();
ImGui::Checkbox(("##_menu_checkbox_" + draggedOpt.name).c_str(), &enabled);
ImGui::SetCursorPos(pos);
}
style::endDisabled(); style::endDisabled();
window->DrawList->AddRect(posMin, posMax, textColor); window->DrawList->AddRect(posMin, posMax, textColor);
} }
@ -79,6 +91,8 @@ bool Menu::draw(bool updateStates) {
if (menuClicked && ImGui::IsMouseDragging(ImGuiMouseButton_Left) && draggedMenuName == "" && clickedMenuName == opt.name) { if (menuClicked && ImGui::IsMouseDragging(ImGuiMouseButton_Left) && draggedMenuName == "" && clickedMenuName == opt.name) {
draggedMenuName = opt.name; draggedMenuName = opt.name;
draggedId = rawId-1;
draggedOpt = opt;
continue; continue;
} }
@ -131,20 +145,10 @@ bool Menu::draw(bool updateStates) {
if (draggedMenuName != "") { if (draggedMenuName != "") {
// Move menu // Move menu
int movedId = 0; order.erase(order.begin() + draggedId);
MenuOption_t movedOpt;
for (int i = 0; i < order.size(); i++) {
if (order[i].name == draggedMenuName) {
movedId = i;
movedOpt = order[i];
break;
}
}
order.erase(order.begin() + movedId);
if (insertBefore == headerTops.size()) { if (insertBefore == headerTops.size()) {
order.push_back(movedOpt); order.push_back(draggedOpt);
} }
else if (insertBeforeName != "") { else if (insertBeforeName != "") {
int beforeId = 0; int beforeId = 0;
@ -154,7 +158,7 @@ bool Menu::draw(bool updateStates) {
break; break;
} }
} }
order.insert(order.begin() + beforeId, movedOpt); order.insert(order.begin() + beforeId, draggedOpt);
} }
changed = true; changed = true;
} }
@ -171,7 +175,17 @@ bool Menu::draw(bool updateStates) {
ImVec2 posMin = ImGui::GetCursorScreenPos(); ImVec2 posMin = ImGui::GetCursorScreenPos();
ImVec2 posMax = ImVec2(posMin.x + menuWidth, posMin.y + ImGui::GetFrameHeight()); ImVec2 posMax = ImVec2(posMin.x + menuWidth, posMin.y + ImGui::GetFrameHeight());
style::beginDisabled(); style::beginDisabled();
ImRect orignalRect = window->WorkRect;
ImGui::CollapsingHeader((draggedMenuName + "##sdrpp_main_menu_dragging").c_str()); ImGui::CollapsingHeader((draggedMenuName + "##sdrpp_main_menu_dragging").c_str());
if (items[draggedOpt.name].inst != NULL) {
window->WorkRect = orignalRect;
ImVec2 pos = ImGui::GetCursorPos();
ImGui::SetCursorPosX(pos.x + menuWidth - ImGui::GetTextLineHeight() - 6);
ImGui::SetCursorPosY(pos.y - 10 - ImGui::GetTextLineHeight());
bool enabled = items[draggedOpt.name].inst->isEnabled();
ImGui::Checkbox(("##_menu_checkbox_" + draggedOpt.name).c_str(), &enabled);
ImGui::SetCursorPos(pos);
}
style::endDisabled(); style::endDisabled();
window->DrawList->AddRect(posMin, posMax, textColor); window->DrawList->AddRect(posMin, posMax, textColor);
} }

3
core/src/gui/widgets/menu.h
View File

@ -36,5 +36,8 @@ private:
std::string insertBeforeName = ""; std::string insertBeforeName = "";
std::vector<std::string> displayedNames; std::vector<std::string> displayedNames;
int draggedId = 0;
MenuOption_t draggedOpt;
std::map<std::string, MenuItem_t> items; std::map<std::string, MenuItem_t> items;
}; };