export alignment as a property
This commit is contained in:
parent
21154e9288
commit
49367b51e0
2 changed files with 30 additions and 3 deletions
|
@ -295,9 +295,35 @@ void DeclarativeView::slotUpdateGeometry()
|
||||||
} else {
|
} else {
|
||||||
const int width = rootObject()->property("width").toInt();
|
const int width = rootObject()->property("width").toInt();
|
||||||
const int height = rootObject()->property("height").toInt();
|
const int height = rootObject()->property("height").toInt();
|
||||||
setGeometry(m_currentScreenGeometry.x() + static_cast<qreal>(m_currentScreenGeometry.width()) * 0.5 - static_cast<qreal>(width) * 0.5,
|
|
||||||
m_currentScreenGeometry.y() + static_cast<qreal>(m_currentScreenGeometry.height()) * 0.5 - static_cast<qreal>(height) * 0.5,
|
Qt::Alignment alignment = Qt::AlignCenter;
|
||||||
width, height);
|
|
||||||
|
if (rootObject()->property("alignment").canConvert<int>()) {
|
||||||
|
alignment = (Qt::Alignment)rootObject()->property("alignment").toInt();
|
||||||
|
}
|
||||||
|
|
||||||
|
int x;
|
||||||
|
int y;
|
||||||
|
|
||||||
|
if (alignment & Qt::AlignLeft) {
|
||||||
|
x = m_currentScreenGeometry.x();
|
||||||
|
} else if (alignment & Qt::AlignLeft) {
|
||||||
|
x = m_currentScreenGeometry.right() - width;
|
||||||
|
//Center
|
||||||
|
} else {
|
||||||
|
x = m_currentScreenGeometry.x() + static_cast<qreal>(m_currentScreenGeometry.width()) * 0.5 - static_cast<qreal>(width) * 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (alignment & Qt::AlignTop) {
|
||||||
|
y = m_currentScreenGeometry.y();
|
||||||
|
} else if (alignment & Qt::AlignBottom) {
|
||||||
|
y = m_currentScreenGeometry.bottom() - height;
|
||||||
|
//Center
|
||||||
|
} else {
|
||||||
|
y = m_currentScreenGeometry.y() + static_cast<qreal>(m_currentScreenGeometry.height()) * 0.5 - static_cast<qreal>(height) * 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
setGeometry(x, y, width, height);
|
||||||
m_relativePos = position();
|
m_relativePos = position();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ Loader {
|
||||||
property int screenWidth : 0
|
property int screenWidth : 0
|
||||||
property int screenHeight : 0
|
property int screenHeight : 0
|
||||||
property bool allDesktops: true
|
property bool allDesktops: true
|
||||||
|
property int alignment: item && item.alignment ? item.alignment : Qt.AlignCenter
|
||||||
property string longestCaption: ""
|
property string longestCaption: ""
|
||||||
property string maskImagePath: item && item.maskImagePath != undefined ? item.maskImagePath : ""
|
property string maskImagePath: item && item.maskImagePath != undefined ? item.maskImagePath : ""
|
||||||
property double maskWidth: item && item.maskWidth != undefined ? item.maskWidth : 0
|
property double maskWidth: item && item.maskWidth != undefined ? item.maskWidth : 0
|
||||||
|
|
Loading…
Reference in a new issue