From 689f45f71093e74839aed7128cd4379713f6c74c Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Sun, 5 Mar 2023 10:32:08 +0100
Subject: [PATCH] push buttons: Fix layouting for eliding and wrapping texts

---
 src/controls/QskPushButtonSkinlet.cpp     | 12 +++---------
 src/layouts/QskSubcontrolLayoutEngine.cpp |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/controls/QskPushButtonSkinlet.cpp b/src/controls/QskPushButtonSkinlet.cpp
index c31141ee..1a81be77 100644
--- a/src/controls/QskPushButtonSkinlet.cpp
+++ b/src/controls/QskPushButtonSkinlet.cpp
@@ -39,16 +39,10 @@ namespace
                 QskPushButton::Text, button->text(),
                 QskPushButton::Graphic, button->graphic().defaultSize() );
 
-            const auto textOptions = button->textOptions();
+            const auto alignment = button->alignmentHint(
+                QskPushButton::Panel, Qt::AlignCenter );
 
-            if ( ( textOptions.elideMode() == Qt::ElideNone )
-                && ( textOptions.wrapMode() == QskTextOptions::NoWrap ) )
-            {
-                const auto alignment = button->alignmentHint(
-                    QskPushButton::Panel, Qt::AlignCenter );
-
-                setFixedContent( QskPushButton::Text, Qt::Horizontal, alignment );
-            }
+            setFixedContent( QskPushButton::Text, Qt::Horizontal, alignment );
         }
     };
 }
diff --git a/src/layouts/QskSubcontrolLayoutEngine.cpp b/src/layouts/QskSubcontrolLayoutEngine.cpp
index 6a28e571..938df350 100644
--- a/src/layouts/QskSubcontrolLayoutEngine.cpp
+++ b/src/layouts/QskSubcontrolLayoutEngine.cpp
@@ -413,7 +413,7 @@ void QskSubcontrolLayoutEngine::setFixedContent(
 {
     if( auto* e = element( subcontrol ) )
     {
-        e->setSizePolicy( QskSizePolicy::Fixed, e->sizePolicy().verticalPolicy() );
+        e->setSizePolicy( QskSizePolicy::Maximum, e->sizePolicy().verticalPolicy() );
     }
 
     Qt::Edges extraSpacing;