changeset 28246:c387a55aed05

Fix problem with uicontrol "Enable" transition from "off"->"inactive" (bug #57128). * BaseControl.cc (update): Call setEnable(true) when "Enable" switched to "inactive".
author Rik <rik@octave.org>
date Sun, 26 Apr 2020 15:01:41 -0700
parents 46a23dc62056
children 20794455ea11
files libgui/graphics/BaseControl.cc
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc	Sun Apr 26 10:48:20 2020 -0700
+++ b/libgui/graphics/BaseControl.cc	Sun Apr 26 15:01:41 2020 -0700
@@ -183,12 +183,15 @@
 
       case uicontrol::properties::ID_ENABLE:
         if (up.enable_is ("inactive"))
-          w->blockSignals (true);
+          {
+            w->blockSignals (true);
+            w->setEnabled (true);
+          }
         else
-        {
-          w->blockSignals (false);
-          w->setEnabled (! up.enable_is ("off"));
-        }
+          {
+            w->blockSignals (false);
+            w->setEnabled (up.enable_is ("on"));
+          }
         break;
 
       case uicontrol::properties::ID_TOOLTIPSTRING: