From 276842be30bf0fd7cc637e375d1423f226c0e740 Mon Sep 17 00:00:00 2001 From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com> Date: Wed, 2 Jul 2025 00:27:26 +0200 Subject: [PATCH] restrict drop down menu closing conditions --- src/gui/drop_down_list.cpp | 3 ++- src/gui/value/choice.cpp | 2 +- src/gui/value/color.cpp | 2 +- src/gui/value/multiple_choice.cpp | 2 +- src/gui/value/package_choice.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/drop_down_list.cpp b/src/gui/drop_down_list.cpp index 48350125..a4e23380 100644 --- a/src/gui/drop_down_list.cpp +++ b/src/gui/drop_down_list.cpp @@ -37,7 +37,8 @@ private: if ( t == wxEVT_LEFT_DOWN || t == wxEVT_RIGHT_DOWN || t == wxEVT_MOVE || t == wxEVT_MENU_HIGHLIGHT || t == wxEVT_MENU_OPEN || t == wxEVT_MENU_OPEN - || t == wxEVT_ACTIVATE || t == wxEVT_CLOSE_WINDOW || t == wxEVT_KILL_FOCUS + || t == wxEVT_CLOSE_WINDOW || t == wxEVT_KILL_FOCUS + //|| t == wxEVT_ACTIVATE || t == wxEVT_COMMAND_TOOL_CLICKED) { // close the list, and pass on the event diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp index 1ec70e71..64172a81 100644 --- a/src/gui/value/choice.cpp +++ b/src/gui/value/choice.cpp @@ -293,7 +293,7 @@ bool ChoiceValueEditor::onChar(wxKeyEvent& ev) { return drop_down->onCharInParent(ev); } void ChoiceValueEditor::onLoseFocus() { - drop_down->hide(false); + //drop_down->hide(false); } void ChoiceValueEditor::draw(RotatedDC& dc) { diff --git a/src/gui/value/color.cpp b/src/gui/value/color.cpp index c43ce417..62606123 100644 --- a/src/gui/value/color.cpp +++ b/src/gui/value/color.cpp @@ -138,7 +138,7 @@ bool ColorValueEditor::onChar(wxKeyEvent& ev) { return drop_down->onCharInParent(ev); } void ColorValueEditor::onLoseFocus() { - drop_down->hide(false); + //drop_down->hide(false); } void ColorValueEditor::draw(RotatedDC& dc) { diff --git a/src/gui/value/multiple_choice.cpp b/src/gui/value/multiple_choice.cpp index 8bd6671a..380fc203 100644 --- a/src/gui/value/multiple_choice.cpp +++ b/src/gui/value/multiple_choice.cpp @@ -135,7 +135,7 @@ bool MultipleChoiceValueEditor::onChar(wxKeyEvent& ev) { } } void MultipleChoiceValueEditor::onLoseFocus() { - if (drop_down) drop_down->hide(false); + //if (drop_down) drop_down->hide(false); } void MultipleChoiceValueEditor::onValueChange() { diff --git a/src/gui/value/package_choice.cpp b/src/gui/value/package_choice.cpp index 7b016a34..c963e706 100644 --- a/src/gui/value/package_choice.cpp +++ b/src/gui/value/package_choice.cpp @@ -95,7 +95,7 @@ bool PackageChoiceValueEditor::onChar(wxKeyEvent& ev) { return drop_down->onCharInParent(ev); } void PackageChoiceValueEditor::onLoseFocus() { - if (drop_down) drop_down->hide(false); + //if (drop_down) drop_down->hide(false); } void PackageChoiceValueEditor::draw(RotatedDC& dc) {