mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-01 20:00:13 +02:00
Add margins scaling to DpiScaler
This commit is contained in:
@@ -46,6 +46,26 @@ DpiScaler::scaled( const QSize& size ) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QMargins
|
||||||
|
DpiScaler::scaled( int left, int top, int right, int bottom ) const
|
||||||
|
{
|
||||||
|
return QMargins( scaledX( left ),
|
||||||
|
scaledY( top ),
|
||||||
|
scaledX( right ),
|
||||||
|
scaledY( bottom ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QMargins
|
||||||
|
DpiScaler::scaled( const QMargins& margins ) const
|
||||||
|
{
|
||||||
|
return scaled( margins.left(),
|
||||||
|
margins.top(),
|
||||||
|
margins.right(),
|
||||||
|
margins.bottom() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
DpiScaler::scaledX( int x ) const
|
DpiScaler::scaledX( int x ) const
|
||||||
{
|
{
|
||||||
@@ -75,6 +95,27 @@ DpiScaler::scaled( const QPaintDevice* pd, const QSize& size )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QMargins
|
||||||
|
DpiScaler::scaled( const QPaintDevice* pd, int left, int top, int right, int bottom )
|
||||||
|
{
|
||||||
|
return QMargins( scaledX( pd, left ),
|
||||||
|
scaledY( pd, top ),
|
||||||
|
scaledX( pd, right ),
|
||||||
|
scaledY( pd, bottom ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QMargins
|
||||||
|
DpiScaler::scaled( const QPaintDevice* pd, const QMargins& margins )
|
||||||
|
{
|
||||||
|
return scaled( pd,
|
||||||
|
margins.left(),
|
||||||
|
margins.top(),
|
||||||
|
margins.right(),
|
||||||
|
margins.bottom() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
DpiScaler::scaledX( const QPaintDevice* pd, int x )
|
DpiScaler::scaledX( const QPaintDevice* pd, int x )
|
||||||
{
|
{
|
||||||
|
@@ -22,6 +22,7 @@
|
|||||||
#include "DllMacro.h"
|
#include "DllMacro.h"
|
||||||
|
|
||||||
#include <QPaintDevice>
|
#include <QPaintDevice>
|
||||||
|
#include <QMargins>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
|
|
||||||
namespace TomahawkUtils
|
namespace TomahawkUtils
|
||||||
@@ -40,12 +41,16 @@ public:
|
|||||||
|
|
||||||
QSize scaled( int w, int h ) const;
|
QSize scaled( int w, int h ) const;
|
||||||
QSize scaled( const QSize& size ) const;
|
QSize scaled( const QSize& size ) const;
|
||||||
|
QMargins scaled( int left, int top, int right, int bottom ) const;
|
||||||
|
QMargins scaled( const QMargins& margins ) const;
|
||||||
int scaledX( int x ) const;
|
int scaledX( int x ) const;
|
||||||
int scaledY( int y ) const;
|
int scaledY( int y ) const;
|
||||||
|
|
||||||
// convenience one-shot methods, usable without composing or private-inheriting DpiScaler
|
// convenience one-shot methods, usable without composing or private-inheriting DpiScaler
|
||||||
static QSize scaled( const QPaintDevice* pd, int w, int h );
|
static QSize scaled( const QPaintDevice* pd, int w, int h );
|
||||||
static QSize scaled( const QPaintDevice* pd, const QSize& size );
|
static QSize scaled( const QPaintDevice* pd, const QSize& size );
|
||||||
|
static QMargins scaled( const QPaintDevice* pd, int left, int top, int right, int bottom );
|
||||||
|
static QMargins scaled( const QPaintDevice* pd, const QMargins& margins );
|
||||||
inline static int scaledX( const QPaintDevice* pd, int x );
|
inline static int scaledX( const QPaintDevice* pd, int x );
|
||||||
inline static int scaledY( const QPaintDevice* pd, int y );
|
inline static int scaledY( const QPaintDevice* pd, int y );
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user