mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

* Only apply scaling once per widget.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-08 17:51:27 +02:00
parent 3748bd9c68
commit 43ed58f66e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/playlist/TrackDetailView.cpp
View File

@@ -42,7 +42,7 @@ TrackDetailView::TrackDetailView( QWidget* parent )
: QWidget( parent ) : QWidget( parent )
, DpiScaler( this ) , DpiScaler( this )
{ {
setFixedWidth( scaledX( 210 ) ); setFixedWidth( scaledX( 200 ) );
setContentsMargins( 0, 0, 0, 0 ); setContentsMargins( 0, 0, 0, 0 );
QPalette pal( palette() ); QPalette pal( palette() );

5
src/libtomahawk/utils/TomahawkUtilsGui.cpp
View File

@@ -234,10 +234,14 @@ unmarginLayout( QLayout* layout )
void void
fixLayoutMargins( QLayout* layout, QWidget* parent ) fixLayoutMargins( QLayout* layout, QWidget* parent )
{ {
if ( parent->property( "scalingDone" ).toBool() )
return;
DpiScaler scaler( parent ); DpiScaler scaler( parent );
layout->setContentsMargins( scaler.scaled( layout->contentsMargins() ) ); layout->setContentsMargins( scaler.scaled( layout->contentsMargins() ) );
layout->setSpacing( scaler.scaledX( layout->spacing() ) ); layout->setSpacing( scaler.scaledX( layout->spacing() ) );
parent->setProperty( "scalingDone", true );
parent->setContentsMargins( scaler.scaled( parent->contentsMargins() ) ); parent->setContentsMargins( scaler.scaled( parent->contentsMargins() ) );
for ( int i = 0; i < layout->count(); i++ ) for ( int i = 0; i < layout->count(); i++ )
@@ -252,7 +256,6 @@ fixLayoutMargins( QLayout* layout, QWidget* parent )
void void
fixMargins( QWidget* widget ) fixMargins( QWidget* widget )
{ {
tDebug() << "FIX MARGINS Found widget:" << widget->objectName() << widget;
if ( widget->layout() ) if ( widget->layout() )
{ {
fixLayoutMargins( widget->layout(), widget ); fixLayoutMargins( widget->layout(), widget );

2
src/libtomahawk/widgets/BasicHeader.cpp
View File

@@ -76,7 +76,7 @@ BasicHeader::BasicHeader( QWidget* parent )
ui->anchor3Label->setPalette( p ); ui->anchor3Label->setPalette( p );
} }
setFixedHeight( scaledY( 140 ) ); setFixedHeight( scaledY( 130 ) );
TomahawkUtils::fixMargins( this ); TomahawkUtils::fixMargins( this );
} }