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

invert parent relationship of the compact and expander

Browse Source
This commit is contained in:
Marco Martin 2014-02-07 16:19:11 +01:00
parent 857150c183
commit 5ba990df15
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,28 +195,30 @@ void DialogProxy::updateVisibility(bool visible)
}
}
KWindowEffects::SlideFromLocation slideLocation = KWindowEffects::NoEdge;
if (!(flags() & Qt::ToolTip)) {
KWindowEffects::SlideFromLocation slideLocation = KWindowEffects::NoEdge;
switch (m_location) {
case Plasma::Types::TopEdge:
slideLocation = KWindowEffects::TopEdge;
break;
case Plasma::Types::LeftEdge:
slideLocation = KWindowEffects::LeftEdge;
break;
case Plasma::Types::RightEdge:
slideLocation = KWindowEffects::RightEdge;
break;
case Plasma::Types::BottomEdge:
slideLocation = KWindowEffects::BottomEdge;
break;
//no edge, no slide
default:
break;
switch (m_location) {
case Plasma::Types::TopEdge:
slideLocation = KWindowEffects::TopEdge;
break;
case Plasma::Types::LeftEdge:
slideLocation = KWindowEffects::LeftEdge;
break;
case Plasma::Types::RightEdge:
slideLocation = KWindowEffects::RightEdge;
break;
case Plasma::Types::BottomEdge:
slideLocation = KWindowEffects::BottomEdge;
break;
//no edge, no slide
default:
break;
}
KWindowEffects::slideWindow(winId(), slideLocation, -1);
}
KWindowEffects::slideWindow(winId(), slideLocation, -1);
if (visible) {
raise();
KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);

14
src/plasmaquick/appletquickitem.cpp
View File

@ -171,12 +171,6 @@ QObject *AppletQuickItemPrivate::createCompactRepresentationItem()
emit q->compactRepresentationItemChanged(compactRepresentationItem.data());
createCompactRepresentationExpanderItem();
if (compactRepresentationExpanderItem) {
compactRepresentationExpanderItem.data()->setProperty("parent", QVariant::fromValue(compactRepresentationItem.data()));
}
return compactRepresentationItem.data();
}
@ -300,12 +294,13 @@ void AppletQuickItemPrivate::compactRepresentationCheck()
if (compactItem && compactExpanderItem) {
//set the root item as the main visible item
compactItem->setParentItem(q);
compactItem->setVisible(true);
compactExpanderItem->setParentItem(q);
compactExpanderItem->setVisible(true);
{
//set anchors
QQmlExpression expr(QtQml::qmlContext(qmlObject->rootObject()), compactItem, "parent");
QQmlProperty prop(compactItem, "anchors.fill");
QQmlExpression expr(QtQml::qmlContext(qmlObject->rootObject()), compactExpanderItem, "parent");
QQmlProperty prop(compactExpanderItem, "anchors.fill");
prop.write(expr.evaluate());
}
@ -313,7 +308,6 @@ void AppletQuickItemPrivate::compactRepresentationCheck()
fullRepresentationItem.data()->setProperty("parent", QVariant());
}
compactExpanderItem->setVisible(true);
compactExpanderItem->setProperty("compactRepresentation", QVariant::fromValue(compactItem));
//The actual full representation will be connected when created
compactExpanderItem->setProperty("fullRepresentation", QVariant::fromValue(QVariant()));