Mercurial > octave

comparison libgui/graphics/EditControl.cc @ 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 bd51beb6205e
children cba489221bab
comparison
equal deleted inserted replaced
28233:9a40d2b40db8 28234:2757f267a198
118 uicontrol::properties& up = properties<uicontrol> (); 118 uicontrol::properties& up = properties<uicontrol> ();
119 119
120 edit->setAcceptRichText (false); 120 edit->setAcceptRichText (false);
121 edit->setPlainText (Utils::fromStringVector 121 edit->setPlainText (Utils::fromStringVector
122 (up.get_string_vector ()).join ("\n")); 122 (up.get_string_vector ()).join ("\n"));
123 edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
124 up.get_verticalalignment ()));
123 125
124 connect (edit, SIGNAL (textChanged (void)), 126 connect (edit, SIGNAL (textChanged (void)),
125 SLOT (textChanged (void))); 127 SLOT (textChanged (void)));
126 connect (edit, SIGNAL (editingFinished (void)), 128 connect (edit, SIGNAL (editingFinished (void)),
127 SLOT (editingFinished (void))); 129 SLOT (editingFinished (void)));
204 switch (pId) 206 switch (pId)
205 { 207 {
206 case uicontrol::properties::ID_STRING: 208 case uicontrol::properties::ID_STRING:
207 edit->setPlainText (Utils::fromStringVector 209 edit->setPlainText (Utils::fromStringVector
208 (up.get_string_vector ()).join ("\n")); 210 (up.get_string_vector ()).join ("\n"));
211 return true;
212
213 case uicontrol::properties::ID_HORIZONTALALIGNMENT:
214 case uicontrol::properties::ID_VERTICALALIGNMENT:
215 edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
216 up.get_verticalalignment ()));
209 return true; 217 return true;
210 218
211 case uicontrol::properties::ID_MIN: 219 case uicontrol::properties::ID_MIN:
212 case uicontrol::properties::ID_MAX: 220 case uicontrol::properties::ID_MAX:
213 if ((up.get_max () - up.get_min ()) <= 1) 221 if ((up.get_max () - up.get_min ()) <= 1)