alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch enabledBorders based on popupPosition

Browse Source
This commit is contained in:
Sebastian Kügler 2013-02-26 04:50:00 +01:00
parent 6a73133da4
commit d6b66ecb96
1 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/declarativeimports/core/dialog.cpp
View File

@ -63,7 +63,7 @@ QString locString(const Plasma::Location l) {
DialogProxy::DialogProxy(QQuickItem *parent) DialogProxy::DialogProxy(QQuickItem *parent)
: QQuickWindow(), : QQuickWindow(),
m_activeWindow(false), m_activeWindow(false),
m_location(Plasma::TopEdge) m_location(Plasma::LeftEdge)
{ {
QSurfaceFormat format; QSurfaceFormat format;
format.setAlphaBufferSize(8); format.setAlphaBufferSize(8);
@ -76,14 +76,16 @@ DialogProxy::DialogProxy(QQuickItem *parent)
m_syncTimer = new QTimer(this); m_syncTimer = new QTimer(this);
m_syncTimer->setSingleShot(true); m_syncTimer->setSingleShot(true);
m_syncTimer->setInterval(250); m_syncTimer->setInterval(2500);
connect(m_syncTimer, &QTimer::timeout, this, &DialogProxy::syncToMainItemSize); connect(m_syncTimer, &QTimer::timeout, this, &DialogProxy::syncToMainItemSize);
//HACK: this property is invoked due to the initialization that gets done to contentItem() in the getter //HACK: this property is invoked due to the initialization that gets done to contentItem() in the getter
property("data"); property("data");
//Create the FrameSvg background. //Create the FrameSvg background.
m_frameSvgItem = new Plasma::FrameSvgItem(contentItem()); m_frameSvgItem = new Plasma::FrameSvgItem(contentItem());
m_frameSvgItem->setImagePath("dialogs/background"); //m_frameSvgItem->setImagePath("dialogs/background");
m_frameSvgItem->setImagePath("widgets/background");
setVisualParent(parent);
} }
DialogProxy::~DialogProxy() DialogProxy::~DialogProxy()
@ -144,6 +146,7 @@ QQuickItem *DialogProxy::visualParent() const
void DialogProxy::setVisualParent(QQuickItem *visualParent) void DialogProxy::setVisualParent(QQuickItem *visualParent)
{ {
qDebug() << "Settting Parent.....";
if (m_visualParent.data() == visualParent) { if (m_visualParent.data() == visualParent) {
return; return;
} }
@ -165,7 +168,43 @@ void DialogProxy::setVisible(const bool visible)
{ {
qDebug() << visible; qDebug() << visible;
if (visible) { if (visible) {
m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::AllBorders);
syncToMainItemSize(); syncToMainItemSize();
QPoint p = popupPosition(m_visualParent.data(), Qt::AlignCenter);
const QRect avail = m_visualParent.data()->window()->screen()->availableGeometry();
int borders = Plasma::FrameSvg::AllBorders;
if (p.x() <= 0) {
//m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::TopBorder | Plasma::FrameSvg::RightBorder | Plasma::FrameSvg::BottomBorder);
//m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::AllBorders & ~Plasma::FrameSvg::LeftBorder);
borders = borders & ~Plasma::FrameSvg::LeftBorder;
}
if (p.y() <= 0) {
//m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::LeftBorder | Plasma::FrameSvg::RightBorder | Plasma::FrameSvg::BottomBorder);
//m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::AllBorders & ~Plasma::FrameSvg::TopBorder);
borders = borders & ~Plasma::FrameSvg::TopBorder;
}
if (avail.width() <= p.x() + m_visualParent.data()->width()) {
//m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::LeftBorder | Plasma::FrameSvg::TopBorder | Plasma::FrameSvg::BottomBorder);
borders = borders & ~Plasma::FrameSvg::RightBorder;
}
if (avail.height() <= p.y() + m_visualParent.data()->height()) {
borders = borders & ~Plasma::FrameSvg::BottomBorder;
//m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::LeftBorder | Plasma::FrameSvg::RightBorder | Plasma::FrameSvg::TopBorder);
}
m_frameSvgItem->setEnabledBorders((Plasma::FrameSvg::EnabledBorder)borders);
syncToMainItemSize();
// enum EnabledBorder {
// NoBorder = 0,
// TopBorder = 1,
// BottomBorder = 2,
// LeftBorder = 4,
// RightBorder = 8,
// AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorder
// };
if (m_visualParent) { if (m_visualParent) {
setPosition(popupPosition(m_visualParent.data(), Qt::AlignCenter)); setPosition(popupPosition(m_visualParent.data(), Qt::AlignCenter));
@ -283,7 +322,7 @@ QPoint DialogProxy::popupPosition(QQuickItem *item, Qt::AlignmentFlag alignment)
// hitting top // hitting top
qDebug() << "hitting top"; qDebug() << "hitting top";
if (l == Plasma::LeftEdge || l == Plasma::RightEdge) { if (l == Plasma::LeftEdge || l == Plasma::RightEdge) {
menuPos.setY(0-topMargin); menuPos.setY(0);
} else { } else {
menuPos.setY(pos.y() + bottomPoint.y()); menuPos.setY(pos.y() + bottomPoint.y());
} }
@ -381,6 +420,10 @@ void DialogProxy::syncToMainItemSize()
if (!m_mainItem) { if (!m_mainItem) {
return; return;
} }
if (m_visualParent.isNull()) {
qDebug() << "booom: " << qobject_cast<QQuickItem*>(parent());
setVisualParent(qobject_cast<QQuickItem*>(parent()));
}
//FIXME: workaround to prevent dialogs of Popup type disappearing on the second show //FIXME: workaround to prevent dialogs of Popup type disappearing on the second show
const QSize s = QSize(m_mainItem.data()->width(), m_mainItem.data()->height()) + const QSize s = QSize(m_mainItem.data()->width(), m_mainItem.data()->height()) +