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

Make it more distinct which items belong to a group, by always putting children of a group below the ExtenderGroup item, and hiding their borders, so each group has only one horizontal seperator.

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=951193
This commit is contained in:
Rob Scheepmaker 2009-04-08 16:16:00 +00:00
parent 094aa403cd
commit 1b2c3da340
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extender.cpp
View File

@ -340,10 +340,14 @@ void Extender::dropEvent(QGraphicsSceneDragDropEvent *event)
void Extender::itemAddedEvent(ExtenderItem *item, const QPointF &pos) void Extender::itemAddedEvent(ExtenderItem *item, const QPointF &pos)
{ {
if (pos == QPointF(-1, -1)) { if (pos == QPointF(-1, -1)) {
if (appearance() == BottomUpStacked) { if (!item->group()) {
d->layout->insertItem(0, item); if (appearance() == BottomUpStacked) {
d->layout->insertItem(0, item);
} else {
d->layout->addItem(item);
}
} else { } else {
d->layout->addItem(item); d->layout->insertItem(d->insertIndexFromPos(item->group()->pos()) + 1, item);
} }
} else { } else {
d->layout->insertItem(d->insertIndexFromPos(pos), item); d->layout->insertItem(d->insertIndexFromPos(pos), item);
@ -351,6 +355,7 @@ void Extender::itemAddedEvent(ExtenderItem *item, const QPointF &pos)
//remove the empty extender message if needed. //remove the empty extender message if needed.
d->updateEmptyExtenderLabel(); d->updateEmptyExtenderLabel();
d->updateBorders();
} }
void Extender::itemRemovedEvent(ExtenderItem *item) void Extender::itemRemovedEvent(ExtenderItem *item)
@ -365,6 +370,7 @@ void Extender::itemRemovedEvent(ExtenderItem *item)
//add the empty extender message if needed. //add the empty extender message if needed.
d->updateEmptyExtenderLabel(); d->updateEmptyExtenderLabel();
d->updateBorders();
} }
void Extender::itemHoverEnterEvent(ExtenderItem *item) void Extender::itemHoverEnterEvent(ExtenderItem *item)
@ -424,7 +430,9 @@ FrameSvg::EnabledBorders Extender::enabledBordersForItem(ExtenderItem *item) con
ExtenderItem *topItem = dynamic_cast<ExtenderItem*>(d->layout->itemAt(0)); ExtenderItem *topItem = dynamic_cast<ExtenderItem*>(d->layout->itemAt(0));
ExtenderItem *bottomItem = dynamic_cast<ExtenderItem*>(d->layout->itemAt(d->layout->count() - 1)); ExtenderItem *bottomItem = dynamic_cast<ExtenderItem*>(d->layout->itemAt(d->layout->count() - 1));
if (d->appearance == TopDownStacked && bottomItem != item) { if (item->group()) {
return FrameSvg::LeftBorder | FrameSvg::RightBorder;
} else if (d->appearance == TopDownStacked && bottomItem != item) {
return FrameSvg::LeftBorder | FrameSvg::BottomBorder | FrameSvg::RightBorder; return FrameSvg::LeftBorder | FrameSvg::BottomBorder | FrameSvg::RightBorder;
} else if (d->appearance == BottomUpStacked && topItem != item) { } else if (d->appearance == BottomUpStacked && topItem != item) {
return FrameSvg::LeftBorder | FrameSvg::TopBorder | FrameSvg::RightBorder; return FrameSvg::LeftBorder | FrameSvg::TopBorder | FrameSvg::RightBorder;
@ -455,7 +463,6 @@ void ExtenderPrivate::addExtenderItem(ExtenderItem *item, const QPointF &pos)
attachedExtenderItems.append(item); attachedExtenderItems.append(item);
q->itemHoverLeaveEvent(item); q->itemHoverLeaveEvent(item);
q->itemAddedEvent(item, pos); q->itemAddedEvent(item, pos);
updateBorders();
emit q->itemAttached(item); emit q->itemAttached(item);
} }
@ -472,7 +479,6 @@ void ExtenderPrivate::removeExtenderItem(ExtenderItem *item)
} }
q->itemRemovedEvent(item); q->itemRemovedEvent(item);
updateBorders();
} }
int ExtenderPrivate::insertIndexFromPos(const QPointF &pos) const int ExtenderPrivate::insertIndexFromPos(const QPointF &pos) const

3
extendergroup.cpp
View File

@ -154,6 +154,9 @@ void ExtenderGroupPrivate::addItemToGroup(Plasma::ExtenderItem *item)
if (collapsed) { if (collapsed) {
q->extender()->itemRemovedEvent(item); q->extender()->itemRemovedEvent(item);
item->hide(); item->hide();
} else {
q->extender()->itemAddedEvent(item);
item->show();
} }
if (!q->isVisible()) { if (!q->isVisible()) {
q->extender()->itemAddedEvent(q); q->extender()->itemAddedEvent(q);