mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-07-14 04:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed inexplicable ImGui bug

Browse Source
This commit is contained in:
Ryzerth
2021-04-23 03:58:10 +02:00
parent 1dbdf48e9a
commit b8e4a79188
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ void Menu::removeEntry(std::string name) {
items.erase(name);
}
bool Menu::draw() {
bool Menu::draw(bool updateStates) {
bool changed = false;
float menuWidth = ImGui::GetContentRegionAvailWidth();
ImGuiWindow* window = ImGui::GetCurrentWindow();
@ -39,7 +39,8 @@ bool Menu::draw() {
window->WorkRect = ImRect(orginalRect.Min, ImVec2(orginalRect.Max.x - ImGui::GetTextLineHeight() - 6, orginalRect.Max.y));
}
if (ImGui::CollapsingHeader(opt.name.c_str(), opt.open ? ImGuiTreeNodeFlags_DefaultOpen : 0)) {
if (updateStates) { ImGui::SetNextItemOpen(opt.open); }
if (ImGui::CollapsingHeader((opt.name + "##sdrpp_main_menu").c_str())) {
if (item.inst != NULL) {
window->WorkRect = orginalRect;
ImVec2 pos = ImGui::GetCursorPos();
@ -53,7 +54,7 @@ bool Menu::draw() {
}
// Check if the state changed
if (!opt.open) {
if (!opt.open && !updateStates) {
opt.open = true;
changed = true;
}
@ -72,12 +73,12 @@ bool Menu::draw() {
}
ImGui::SetCursorPos(pos);
if (opt.open) {
if (opt.open && !updateStates) {
opt.open = false;
changed = true;
}
}
else if (opt.open) {
else if (opt.open && !updateStates) {
opt.open = false;
changed = true;
}

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

@ -21,7 +21,7 @@ public:
void registerEntry(std::string name, void (*drawHandler)(void* ctx), void* ctx = NULL, ModuleManager::Instance* inst = NULL);
void removeEntry(std::string name);
bool draw();
bool draw(bool updateStates);
std::vector<MenuOption_t> order;