From 0f49825d64d722c92be06cd825fa04d1fe3b5cca Mon Sep 17 00:00:00 2001 From: Chris Lemin Date: Tue, 2 Jul 2019 09:51:04 +0100 Subject: [PATCH] Add support for alignment flags to wxStaticText in wxQt Ensure static text fields use the alignment specified by WX on creation. Closes https://github.com/wxWidgets/wxWidgets/pull/1381 --- src/expat | 2 +- src/qt/stattext.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/expat b/src/expat index b99766ce61..ff2299e5f0 160000 --- a/src/expat +++ b/src/expat @@ -1 +1 @@ -Subproject commit b99766ce61f2cefa0ada22204765c1bf08802216 +Subproject commit ff2299e5f093beb3d218cf095078869b59aeb98d diff --git a/src/qt/stattext.cpp b/src/qt/stattext.cpp index 2eb50b5f18..f6d2bcde63 100644 --- a/src/qt/stattext.cpp +++ b/src/qt/stattext.cpp @@ -55,6 +55,15 @@ bool wxStaticText::Create(wxWindow *parent, m_qtLabel->setBuddy( m_qtLabel ); m_qtLabel->setTextInteractionFlags( Qt::NoTextInteraction ); + // Translate the WX horizontal alignment flags to Qt alignment flags + // (notice that wxALIGN_LEFT is default and has the value of 0). + if ( style & wxALIGN_CENTER_HORIZONTAL ) + m_qtLabel->setAlignment(Qt::AlignHCenter); + else if ((style & wxALIGN_MASK) == wxALIGN_RIGHT) + m_qtLabel->setAlignment(Qt::AlignRight); + else + m_qtLabel->setAlignment(Qt::AlignLeft); + return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name ); }