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

code cleanup

This commit is contained in:
Uwe Rathmann 2020-12-15 18:12:48 +01:00
parent e64111bc35
commit 6c0f0810f1
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
skins/material/QskMaterialSkin.cpp
View File

@ -198,7 +198,6 @@ void QskMaterialSkin::initPopupHints()
void QskMaterialSkin::initTextLabelHints() void QskMaterialSkin::initTextLabelHints()
{ {
using namespace QskAspect;
using Q = QskTextLabel; using Q = QskTextLabel;
const auto& pal = m_data->palette; const auto& pal = m_data->palette;
@ -215,7 +214,6 @@ void QskMaterialSkin::initTextLabelHints()
void QskMaterialSkin::initTextInputHints() void QskMaterialSkin::initTextInputHints()
{ {
using namespace QskAspect;
using Q = QskTextInput; using Q = QskTextInput;
setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignTop ); setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignTop );
@ -257,7 +255,6 @@ void QskMaterialSkin::initProgressBarHints()
void QskMaterialSkin::initFocusIndicatorHints() void QskMaterialSkin::initFocusIndicatorHints()
{ {
using namespace QskAspect;
using Q = QskFocusIndicator; using Q = QskFocusIndicator;
const auto& pal = m_data->palette; const auto& pal = m_data->palette;
@ -313,7 +310,7 @@ void QskMaterialSkin::initPageIndicatorHints()
setBoxBorderMetrics( Q::Panel, 0 ); setBoxBorderMetrics( Q::Panel, 0 );
setGradient( Q::Panel, QskGradient() ); setGradient( Q::Panel, QskGradient() );
setMetric( Q::Panel | Spacing, 3 ); setSpacing( Q::Panel, 3 );
} }
void QskMaterialSkin::initPushButtonHints() void QskMaterialSkin::initPushButtonHints()
@ -327,7 +324,7 @@ void QskMaterialSkin::initPushButtonHints()
setMetric( Q::Panel | MinimumWidth, qskDpiScaled( 75.0 ) ); setMetric( Q::Panel | MinimumWidth, qskDpiScaled( 75.0 ) );
setMetric( Q::Panel | MinimumHeight, qskDpiScaled( 23.0 ) ); setMetric( Q::Panel | MinimumHeight, qskDpiScaled( 23.0 ) );
setMetric( Q::Panel | Spacing, 4 ); setSpacing( Q::Panel, 4 );
const QskMargins margin( 4, 3 ); const QskMargins margin( 4, 3 );
const QskMargins padding( 10, 6 ); const QskMargins padding( 10, 6 );
@ -389,11 +386,8 @@ void QskMaterialSkin::initDialogButtonHints()
setMetric( Q::Panel | MinimumHeight, 16 ); setMetric( Q::Panel | MinimumHeight, 16 );
setMetric( Q::Panel | Spacing, 4 ); setMetric( Q::Panel | Spacing, 4 );
const QskMargins margin( 4, 3 ); setMargin( Q::Panel, QskMargins( 4, 3 ) );
const QskMargins padding( 10, 6 ); setPadding( Q::Panel, QskMargins( 10, 6 ) );
setMargin( Q::Panel, margin );
setPadding( Q::Panel, padding );
const QskBoxBorderColors borderColors( Grey400, Grey300, Grey400, Grey600 ); const QskBoxBorderColors borderColors( Grey400, Grey300, Grey400, Grey600 );
@ -655,7 +649,7 @@ void QskMaterialSkin::initScrollViewHints()
const auto& pal = m_data->palette; const auto& pal = m_data->palette;
setMetric( Q::Panel | Spacing, 2 ); setSpacing( Q::Panel, 2 );
setBoxShape( Q::Viewport, 5 ); setBoxShape( Q::Viewport, 5 );
setBoxBorderMetrics( Q::Viewport, 1 ); setBoxBorderMetrics( Q::Viewport, 1 );

4
skins/squiek/QskSquiekSkin.cpp
View File

@ -274,7 +274,6 @@ void QskSquiekSkin::initPopupHints()
void QskSquiekSkin::initTextLabelHints() void QskSquiekSkin::initTextLabelHints()
{ {
using namespace QskAspect;
using Q = QskTextLabel; using Q = QskTextLabel;
const auto& pal = m_data->palette; const auto& pal = m_data->palette;
@ -361,7 +360,6 @@ void QskSquiekSkin::initProgressBarHints()
void QskSquiekSkin::initFocusIndicatorHints() void QskSquiekSkin::initFocusIndicatorHints()
{ {
using namespace QskAspect;
using Q = QskFocusIndicator; using Q = QskFocusIndicator;
const auto& pal = m_data->palette; const auto& pal = m_data->palette;
@ -703,7 +701,6 @@ void QskSquiekSkin::initTabViewHints()
void QskSquiekSkin::initInputPanelHints() void QskSquiekSkin::initInputPanelHints()
{ {
using namespace QskAspect;
using Q = QskInputPanelBox; using Q = QskInputPanelBox;
setPadding( Q::Panel, 5 ); setPadding( Q::Panel, 5 );
@ -803,7 +800,6 @@ void QskSquiekSkin::initScrollViewHints()
void QskSquiekSkin::initListViewHints() void QskSquiekSkin::initListViewHints()
{ {
using namespace QskAspect;
using Q = QskListView; using Q = QskListView;
const auto& pal = m_data->palette; const auto& pal = m_data->palette;

4
src/controls/QskControl.cpp
View File

@ -201,9 +201,7 @@ void QskControl::setMargins( const QMarginsF& margins )
void QskControl::resetMargins() void QskControl::resetMargins()
{ {
using namespace QskAspect; if ( resetMarginHint( QskAspect::Control ) )
if ( resetMarginHint( Control ) )
{ {
resetImplicitSize(); resetImplicitSize();

3
src/controls/QskProgressBar.cpp
View File

@ -178,9 +178,8 @@ void QskProgressBar::setBarGradient( const QskGradient& gradient )
void QskProgressBar::resetBarGradient() void QskProgressBar::resetBarGradient()
{ {
using namespace QskAspect; using namespace QskAspect;
const auto aspect = QskProgressBar::Bar | Color;
if ( resetHint( aspect | Vertical ) || resetHint( aspect | Horizontal ) ) if ( resetColor( Bar | Vertical ) || resetHint( Bar | Horizontal ) )
update(); update();
} }