From 723650d51d49593970096dcd02becf022414438c Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 3 Aug 2017 11:25:26 +0200 Subject: [PATCH] Honour text alignment while formatting window label Take into account text alignment while formatting NSAttributedString containing the text of the label. Closes #17933. --- src/osx/cocoa/window.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index ff4c1d3780..b891f10f60 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -2456,7 +2456,13 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding initWithString:cf.AsNSString()]; [attrString beginEditing]; - [attrString setAlignment:NSCenterTextAlignment + + NSTextAlignment textAlign; + if ( [m_osxView isKindOfClass:[NSControl class]] ) + textAlign = [(id)m_osxView alignment]; + else + textAlign = NSCenterTextAlignment; + [attrString setAlignment:textAlign range:NSMakeRange(0, [attrString length])]; [attrString addAttribute:NSFontAttributeName