Merge branch 'master' into features/drawer
This commit is contained in:
commit
930cb321a1
|
@ -99,29 +99,29 @@ static void qskLayoutDrawer( const QRectF& rect, QskDrawer* drawer )
|
||||||
static inline QRectF qskSlidingRect(
|
static inline QRectF qskSlidingRect(
|
||||||
const QSizeF& size, Qt::Edge edge, qreal ratio )
|
const QSizeF& size, Qt::Edge edge, qreal ratio )
|
||||||
{
|
{
|
||||||
auto dx = 0.0;
|
auto x = 0.0;
|
||||||
auto dy = 0.0;
|
auto y = 0.0;
|
||||||
|
|
||||||
switch( edge )
|
switch( edge )
|
||||||
{
|
{
|
||||||
case Qt::LeftEdge:
|
case Qt::LeftEdge:
|
||||||
dx = -ratio * size.width();
|
x = -ratio * size.width();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Qt::RightEdge:
|
case Qt::RightEdge:
|
||||||
dx = ratio * size.width();
|
x = ratio * size.width();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Qt::TopEdge:
|
case Qt::TopEdge:
|
||||||
dy = -ratio * size.height();
|
y = -ratio * size.height();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Qt::BottomEdge:
|
case Qt::BottomEdge:
|
||||||
dy = ratio * size.height();
|
y = ratio * size.height();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return QRectF( dx, dy, size.width(), size.height() );
|
return QRectF( x, y, size.width(), size.height() );
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
|
|
Loading…
Reference in New Issue