diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index b1516a98..ce5a4ad6 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -598,8 +598,7 @@ void Editor::setupPushButton() setFlagHint( Q::Text | Q::Disabled | A::Style, Qsk::Sunken ); - setAlignment( Q::Text | A::Vertical, Qt::AlignCenter ); - setAlignment( Q::Text | A::Horizontal, Qt::AlignLeft | Qt::AlignVCenter ); + setAlignment( Q::Text, Qt::AlignCenter ); setColor( Q::Text, m_pal.themeForeground ); setColor( Q::Text | Q::Disabled, m_pal.darker200 ); diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp index e49e4ba9..36f74b16 100644 --- a/src/controls/QskPushButton.cpp +++ b/src/controls/QskPushButton.cpp @@ -14,8 +14,6 @@ #include "QskSkinlet.h" #include "QskTextOptions.h" -#include - QSK_SUBCONTROL( QskPushButton, Panel ) QSK_SUBCONTROL( QskPushButton, Ripple ) QSK_SUBCONTROL( QskPushButton, Text ) @@ -229,26 +227,6 @@ void QskPushButton::updateResources() QskAspect::Placement QskPushButton::effectivePlacement() const { - if ( hasGraphic() && !text().isEmpty() ) - { - // for the moment we only support the direction. TODO ... - - auto aspect = Panel | QskAspect::Direction; - aspect.setPlacement( QskAspect::Vertical ); // to avoid recursions TODO ... - - const auto dir = flagHint( aspect, Qsk::LeftToRight ); - switch( dir ) - { - case Qsk::LeftToRight: - case Qsk::RightToLeft: - return QskAspect::Horizontal; - - case Qsk::TopToBottom: - case Qsk::BottomToTop: - return QskAspect::Vertical; - } - } - return Inherited::effectivePlacement(); }