peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

orientation removed from the placement bits

Browse Source
This commit is contained in:
Uwe Rathmann 2023-02-15 16:16:19 +01:00
parent 4c10d8b0e4
commit 454688361c
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skins/squiek/QskSquiekSkin.cpp
View File

@ -598,8 +598,7 @@ void Editor::setupPushButton()
setFlagHint( Q::Text | Q::Disabled | A::Style, Qsk::Sunken ); setFlagHint( Q::Text | Q::Disabled | A::Style, Qsk::Sunken );
setAlignment( Q::Text | A::Vertical, Qt::AlignCenter ); setAlignment( Q::Text, Qt::AlignCenter );
setAlignment( Q::Text | A::Horizontal, Qt::AlignLeft | Qt::AlignVCenter );
setColor( Q::Text, m_pal.themeForeground ); setColor( Q::Text, m_pal.themeForeground );
setColor( Q::Text | Q::Disabled, m_pal.darker200 ); setColor( Q::Text | Q::Disabled, m_pal.darker200 );

22
src/controls/QskPushButton.cpp
View File

@ -14,8 +14,6 @@
#include "QskSkinlet.h" #include "QskSkinlet.h"
#include "QskTextOptions.h" #include "QskTextOptions.h"
#include <qfontmetrics.h>
QSK_SUBCONTROL( QskPushButton, Panel ) QSK_SUBCONTROL( QskPushButton, Panel )
QSK_SUBCONTROL( QskPushButton, Ripple ) QSK_SUBCONTROL( QskPushButton, Ripple )
QSK_SUBCONTROL( QskPushButton, Text ) QSK_SUBCONTROL( QskPushButton, Text )
@ -229,26 +227,6 @@ void QskPushButton::updateResources()
QskAspect::Placement QskPushButton::effectivePlacement() const 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(); return Inherited::effectivePlacement();
} }