# HG changeset patch # User Rik # Date 1587518353 25200 # Node ID 2757f267a19815955ceced905bac5a25d0e7ccef # Parent 9a40d2b40db8de2b0f719bbd96778d89b8a01b65 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 (). diff -r 9a40d2b40db8 -r 2757f267a198 libgui/graphics/EditControl.cc --- 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)