changeset 30628:09b2f1847842

maint: merge stable to default.
author Rik <rik@octave.org>
date Tue, 11 Jan 2022 08:19:33 -0800
parents 3b2140303d33 (current diff) 579a21f74d6d (diff)
children b55189efd92a
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc	Sun Jan 09 18:13:14 2022 +0100
+++ b/libgui/src/octave-dock-widget.cc	Tue Jan 11 08:19:33 2022 -0800
@@ -626,7 +626,7 @@
     // for widgets docked to the main window (non floating) and activate
     // the widget currently under the mouse
     if (m_focus_follows_mouse && ! isFloating () && (e->type () == QEvent::Enter))
-      activate ();
+      setFocus ();
 
     return QDockWidget::eventFilter (obj, e);
   }
--- a/libinterp/octave-value/ov-range.h	Sun Jan 09 18:13:14 2022 +0100
+++ b/libinterp/octave-value/ov-range.h	Tue Jan 11 08:19:33 2022 -0800
@@ -192,7 +192,7 @@
     return btyp_isinteger (builtin_type ());
   }
 
-  bool isreal (void) const { return isfloat (); }
+  bool isreal (void) const { return true; }
 
   bool isnumeric (void) const
   {