Mercurial > hg > octave-nkf
diff libgui/graphics/TextControl.cc @ 20176:3cc0734283dc
style fixes in Qt graphics code
* Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc,
CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc,
Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc,
Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc,
ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc,
PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc,
RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc,
__init_qt__.cc: Follow a few more Octave coding conventions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 19 Mar 2015 12:27:54 -0400 |
| parents | fe0e34be5576 |
| children | f0e61a67ad9f |
line wrap: on
line diff
--- a/libgui/graphics/TextControl.cc +++ b/libgui/graphics/TextControl.cc @@ -33,7 +33,8 @@ namespace QtHandles { -TextControl* TextControl::create (const graphics_object& go) +TextControl* +TextControl::create (const graphics_object& go) { Object* parent = Object::parentObject (go); @@ -49,7 +50,7 @@ } TextControl::TextControl (const graphics_object& go, QLabel* label) - : BaseControl (go, label) + : BaseControl (go, label) { uicontrol::properties& up = properties<uicontrol> (); @@ -66,7 +67,8 @@ { } -void TextControl::update (int pId) +void +TextControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); QLabel* label = qWidget<QLabel> (); @@ -77,11 +79,13 @@ // FIXME: support string_vector label->setText (Utils::fromStdString (up.get_string_string ())); break; + case uicontrol::properties::ID_HORIZONTALALIGNMENT: case uicontrol::properties::ID_VERTICALALIGNMENT: label->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (), up.get_verticalalignment ())); break; + default: BaseControl::update (pId); break;