Mercurial > octave

changeset 28234:2757f267a198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement "HorizontalAlignment" property for multi-line "Edit" uicontrols (bug #58224). * EditControl.cc (init): Call setAlignment () when creating a multi-line TextEdit uicontrol. * EditControl.cc (updateMultiLine): In switch statement check for "HorizontalAlignment" or "VerticalAlignment" property change and call setAlignment ().
author Rik <rik@octave.org>
date Tue, 21 Apr 2020 18:19:13 -0700
parents 9a40d2b40db8
children a6edb8097ec6
files libgui/graphics/EditControl.cc
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/EditControl.cc	Tue Apr 21 17:06:35 2020 -0700
+++ b/libgui/graphics/EditControl.cc	Tue Apr 21 18:19:13 2020 -0700
@@ -120,6 +120,8 @@
     edit->setAcceptRichText (false);
     edit->setPlainText (Utils::fromStringVector
                         (up.get_string_vector ()).join ("\n"));
+    edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
+                                            up.get_verticalalignment ()));
 
     connect (edit, SIGNAL (textChanged (void)),
              SLOT (textChanged (void)));
@@ -208,6 +210,12 @@
                             (up.get_string_vector ()).join ("\n"));
         return true;
 
+      case uicontrol::properties::ID_HORIZONTALALIGNMENT:
+      case uicontrol::properties::ID_VERTICALALIGNMENT:
+        edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
+                                                up.get_verticalalignment ()));
+        return true;
+
       case uicontrol::properties::ID_MIN:
       case uicontrol::properties::ID_MAX:
         if ((up.get_max () - up.get_min ()) <= 1)