vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

export alignment as a property

icc-effect-5.14.5
Marco Martin 2013-11-05 11:26:29 +01:00
parent 21154e9288
commit 49367b51e0
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tabbox/declarative.cpp
View File

@ -295,9 +295,35 @@ void DeclarativeView::slotUpdateGeometry()
} else {
const int width = rootObject()->property("width").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,
width, height);
Qt::Alignment alignment = Qt::AlignCenter;
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();
}
}

1
tabbox/qml/tabbox.qml
View File

@ -25,6 +25,7 @@ Loader {
property int screenWidth : 0
property int screenHeight : 0
property bool allDesktops: true
property int alignment: item && item.alignment ? item.alignment : Qt.AlignCenter
property string longestCaption: ""
property string maskImagePath: item && item.maskImagePath != undefined ? item.maskImagePath : ""
property double maskWidth: item && item.maskWidth != undefined ? item.maskWidth : 0