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

* don't show the test action on every icon; we know it works ;)

Browse Source 
* set the rects on the other actions properly
* shift the rects around when the icon resizes

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=690431
This commit is contained in:
Aaron J. Seigo 2007-07-21 04:19:00 +00:00
parent 01ab982d54
commit fc0938d3bb
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
widgets/icon.cpp
View File

@ -180,7 +180,6 @@ class Icon::Private
QIcon icon; QIcon icon;
ButtonState state; ButtonState state;
QAction *testAction;
QList<IconAction*> cornerActions; QList<IconAction*> cornerActions;
}; };
@ -372,9 +371,6 @@ void Icon::init()
{ {
setAcceptedMouseButtons(Qt::LeftButton); setAcceptedMouseButtons(Qt::LeftButton);
setAcceptsHoverEvents(true); setAcceptsHoverEvents(true);
d->testAction = new QAction(KIcon("exec"), i18n("Open"), this);
addAction(d->testAction);
} }
void Icon::addAction(QAction *action) void Icon::addAction(QAction *action)
@ -388,16 +384,20 @@ void Icon::addAction(QAction *action)
d->cornerActions.append(iconAction); d->cornerActions.append(iconAction);
connect(action, SIGNAL(destroyed(QObject*)), this, SLOT(actionDestroyed(QObject*))); connect(action, SIGNAL(destroyed(QObject*)), this, SLOT(actionDestroyed(QObject*)));
//FIXME: set other icon rects properly, and shift them when we change our size //TODO: fewer magic numbers, please =) 38, 32, 6, etc... needs to go.
// at the very least static const ints with nice names.
switch (count) { switch (count) {
case Private::TopLeft: case Private::TopLeft:
iconAction->setRect(QRectF(6, 6, 32, 32)); iconAction->setRect(QRectF(6, 6, 32, 32));
break; break;
case Private::TopRight: case Private::TopRight:
iconAction->setRect(QRectF(d->size.width() - 38, 6, 32, 32));
break; break;
case Private::BottomLeft: case Private::BottomLeft:
iconAction->setRect(QRectF(6, d->size.height() - 38, 32, 32));
break; break;
case Private::BottomRight: case Private::BottomRight:
iconAction->setRect(QRectF(d->size.width() - 38, d->size.height() - 38, 32, 32));
break; break;
} }
} }
@ -425,6 +425,30 @@ void Icon::calculateSize()
qreal width = margin + qMax(fmSize.width(), d->iconSize.width()) + margin; qreal width = margin + qMax(fmSize.width(), d->iconSize.width()) + margin;
d->size = QSizeF(width, height); d->size = QSizeF(width, height);
d->svg.resize(d->size); d->svg.resize(d->size);
int count = 0;
foreach (IconAction* iconAction, d->cornerActions) {
//TODO: fewer magic numbers, please =) 38, 32, 6, etc... needs to go.
// at the very least static const ints with nice names.
switch (count) {
case Private::TopLeft:
// top left never changes, so don't bother setting it
//iconAction->setRect(QRectF(6, 6, 32, 32));
break;
case Private::TopRight:
iconAction->setRect(QRectF(d->size.width() - 38, 6, 32, 32));
break;
case Private::BottomLeft:
iconAction->setRect(QRectF(6, d->size.height() - 38, 32, 32));
break;
case Private::BottomRight:
iconAction->setRect(QRectF(d->size.width() - 38, d->size.height() - 38, 32, 32));
break;
}
++count;
}
update(); update();
} }