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

draw the toolbox so i can see where it is while working on this stuff

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=884083
This commit is contained in:
Aaron J. Seigo 2008-11-14 07:54:49 +00:00
parent 004f5e0276
commit c7cb88677c
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
private/desktoptoolbox.cpp
View File

@ -31,7 +31,6 @@
#include <plasma/theme.h> #include <plasma/theme.h>
#include <plasma/paintutils.h> #include <plasma/paintutils.h>
#include <plasma/applet.h> #include <plasma/applet.h>
namespace Plasma namespace Plasma
@ -69,6 +68,13 @@ class EmptyGraphicsItem : public QGraphicsItem
Q_UNUSED(p) Q_UNUSED(p)
//p->setPen(Qt::red); //p->setPen(Qt::red);
//p->drawRect(boundingRect()); //p->drawRect(boundingRect());
p->setRenderHints(QPainter::Antialiasing);
p->translate(0.5, 0.5);
//TODO: use Plasma::Theme, and a gradient for the brush!
p->setPen(QPen(Qt::white, 1));
p->setBrush(QColor(0, 0, 0, 160));
QPainterPath path = PaintUtils::roundedRectangle(boundingRect(), 10);
p->drawPath(path);
} }
private: private:
@ -290,15 +296,15 @@ void DesktopToolBox::showToolBox()
switch (corner()) { switch (corner()) {
case TopRight: case TopRight:
x = (int)boundingRect().right() - maxwidth - iconWidth - 5; x = (int)boundingRect().right() - maxwidth - iconWidth - 5;
y = (int)boundingRect().top() + 5; y = (int)boundingRect().top() + 10;
break; break;
case Top: case Top:
x = (int)boundingRect().center().x() - iconWidth; x = (int)boundingRect().center().x() - iconWidth;
y = (int)boundingRect().top() + iconWidth + 5; y = (int)boundingRect().top() + iconWidth + 10;
break; break;
case TopLeft: case TopLeft:
x = (int)boundingRect().left() + iconWidth + 5; x = (int)boundingRect().left() + iconWidth + 5;
y = (int)boundingRect().top() + 5; y = (int)boundingRect().top() + 10;
break; break;
case Left: case Left:
x = (int)boundingRect().left() + iconWidth + 5; x = (int)boundingRect().left() + iconWidth + 5;
@ -322,12 +328,19 @@ void DesktopToolBox::showToolBox()
y = (int)boundingRect().bottom() - iconWidth - 5; y = (int)boundingRect().bottom() - iconWidth - 5;
break; break;
} }
int startX = x;
int startY = y;
x += 5;
Plasma::Animator *animdriver = Plasma::Animator::self(); Plasma::Animator *animdriver = Plasma::Animator::self();
foreach (QGraphicsItem *tool, QGraphicsItem::children()) { foreach (QGraphicsItem *tool, QGraphicsItem::children()) {
if (tool == d->toolBacker) { if (tool == d->toolBacker) {
continue; continue;
} }
y += 5;
if (!tool->isEnabled()) { if (!tool->isEnabled()) {
if (tool->isVisible()) { if (tool->isVisible()) {
const int height = static_cast<int>(tool->boundingRect().height()); const int height = static_cast<int>(tool->boundingRect().height());
@ -341,13 +354,14 @@ void DesktopToolBox::showToolBox()
tool->show(); tool->show();
animdriver->moveItem(tool, Plasma::Animator::SlideInMovement, QPoint(x, y)); animdriver->moveItem(tool, Plasma::Animator::SlideInMovement, QPoint(x, y));
//x += 0; //x += 0;
y += static_cast<int>(tool->boundingRect().height()) + 5; y += static_cast<int>(tool->boundingRect().height());
} }
if (!d->toolBacker) { if (!d->toolBacker) {
d->toolBacker = new EmptyGraphicsItem(this); d->toolBacker = new EmptyGraphicsItem(this);
} }
d->toolBacker->setRect(QRectF(QPointF(x, 0), QSizeF(maxwidth, y - 10)));
d->toolBacker->setRect(QRectF(QPointF(startX, startY), QSizeF(maxwidth + 10, y)));
d->toolBacker->show(); d->toolBacker->show();
if (d->animCircleId) { if (d->animCircleId) {