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

aseigo's first run over this code;

Browse Source 
* don't use magic pixel values, use static const ints and it makes everything so easy to play with
* make the borders and icons much smaller
* allow dragging using any area that isn't the applet. really, we ought to be able to drag on the applet border as well, but ce la vis?

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=738128
This commit is contained in:
Aaron J. Seigo 2007-11-18 01:16:47 +00:00
parent 1dae9bba86
commit 3af857e265
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
applethandle.cpp
View File

@ -43,22 +43,22 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet)
m_rect = m_applet->boundingRect(); m_rect = m_applet->boundingRect();
m_rect = m_applet->mapToParent(m_rect).boundingRect(); m_rect = m_applet->mapToParent(m_rect).boundingRect();
const int requiredHeight = m_applet->hasConfigurationInterface() ? 158 : 116; const int requiredHeight = (HANDLE_WIDTH * 2) + m_applet->hasConfigurationInterface() ? + (ICON_SIZE * 4) : (ICON_SIZE * 3);
if (m_rect.height()<requiredHeight) { if (m_rect.height() < requiredHeight) {
float delta = requiredHeight-m_rect.height(); float delta = requiredHeight - m_rect.height();
delta = delta/2.0; delta = delta/2.0;
if (delta>0.0) { if (delta > 0.0) {
m_rect.adjust(0.0, -delta, 0.0, delta); m_rect.adjust(0.0, -delta, 0.0, delta);
} }
} }
m_rect.adjust(-20.0, -20.0, 20.0, 20.0); m_rect.adjust(-HANDLE_WIDTH, -HANDLE_WIDTH, HANDLE_WIDTH, HANDLE_WIDTH);
if (m_applet->pos().x()<=60.0) { if (m_applet->pos().x() <= ((HANDLE_WIDTH * 2) + ICON_SIZE + ICON_MARGIN)) {
m_rect.adjust(0.0, 0.0, 40.0, 0.0); m_rect.adjust(0.0, 0.0, ICON_MARGIN + ICON_SIZE, 0.0);
m_buttonsOnRight = true; m_buttonsOnRight = true;
} else { } else {
m_rect.adjust(-40.0, 0.0, 0.0, 0.0); m_rect.adjust(- ICON_MARGIN - ICON_SIZE, 0.0, 0.0, 0.0);
} }
m_applet->setParentItem(this); m_applet->setParentItem(this);
@ -110,9 +110,9 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
QPointF point = m_rect.topLeft(); QPointF point = m_rect.topLeft();
if (m_buttonsOnRight) { if (m_buttonsOnRight) {
point+= QPointF(m_rect.width()-52.0, 20.0); point += QPointF(m_rect.width() - ICON_SIZE - ICON_MARGIN, HANDLE_WIDTH);
} else { } else {
point+= QPointF(20.0, 20.0); point+= QPointF(HANDLE_WIDTH, HANDLE_WIDTH);
} }
QPointF shiftM; QPointF shiftM;
@ -138,15 +138,15 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
break; break;
} }
painter->drawPixmap(point+shiftM, KIcon("exec").pixmap(32,32)); // FIXME: I'd like a "transform-move" here painter->drawPixmap(point+shiftM, KIcon("exec").pixmap(ICON_SIZE, ICON_SIZE)); // FIXME: I'd like a "transform-move" here
if (m_applet->hasConfigurationInterface()) { if (m_applet->hasConfigurationInterface()) {
point+=QPointF(0.0, 42.0); point+=QPointF(0.0, ICON_SIZE + ICON_MARGIN);
painter->drawPixmap(point+shiftC, KIcon("configure").pixmap(32,32)); painter->drawPixmap(point+shiftC, KIcon("configure").pixmap(ICON_SIZE, ICON_SIZE));
} }
point+=QPointF(0.0, 42.0); point+=QPointF(0.0, ICON_SIZE + ICON_MARGIN);
painter->drawPixmap(point+shiftD, KIcon("edit-delete").pixmap(32,32)); painter->drawPixmap(point+shiftD, KIcon("edit-delete").pixmap(ICON_SIZE, ICON_SIZE));
point+=QPointF(0.0, 42.0); point+=QPointF(0.0, ICON_SIZE + ICON_MARGIN);
painter->drawPixmap(point+shiftR, KIcon("transform-rotate").pixmap(32,32)); painter->drawPixmap(point+shiftR, KIcon("transform-rotate").pixmap(ICON_SIZE, ICON_SIZE));
painter->restore(); painter->restore();
} }
@ -156,35 +156,36 @@ AppletHandle::ButtonType AppletHandle::mapToButton(const QPointF &point) const
QPointF basePoint = m_rect.topLeft(); QPointF basePoint = m_rect.topLeft();
if (m_buttonsOnRight) { if (m_buttonsOnRight) {
basePoint+= QPointF(m_rect.width()-52.0, 20.0); basePoint+= QPointF(m_rect.width() - ICON_SIZE - ICON_MARGIN, HANDLE_WIDTH);
} else { } else {
basePoint+= QPointF(20.0, 20.0); basePoint+= QPointF(HANDLE_WIDTH, HANDLE_WIDTH);
} }
QPolygonF activeArea = QPolygonF(QRectF(basePoint, QSizeF(32.0, 32.0))); QPolygonF activeArea = QPolygonF(QRectF(basePoint, QSizeF(ICON_SIZE, ICON_SIZE)));
if (activeArea.containsPoint(point, Qt::OddEvenFill)) { if (activeArea.containsPoint(point, Qt::OddEvenFill)) {
return MoveButton; return MoveButton;
} }
if( m_applet->hasConfigurationInterface() ) { if (m_applet->hasConfigurationInterface()) {
activeArea.translate(QPointF(0.0, 42.0)); activeArea.translate(QPointF(0.0, ICON_SIZE + ICON_MARGIN));
if (activeArea.containsPoint(point, Qt::OddEvenFill)) { if (activeArea.containsPoint(point, Qt::OddEvenFill)) {
return ConfigureButton; return ConfigureButton;
} }
} }
activeArea.translate(QPointF(0.0, 42.0)); activeArea.translate(QPointF(0.0, ICON_SIZE + ICON_MARGIN));
if (activeArea.containsPoint(point, Qt::OddEvenFill)) { if (activeArea.containsPoint(point, Qt::OddEvenFill)) {
return RemoveButton; return RemoveButton;
} }
activeArea.translate(QPointF(0.0, 42.0)); activeArea.translate(QPointF(0.0, ICON_SIZE + ICON_MARGIN));
if (activeArea.containsPoint(point, Qt::OddEvenFill)) { if (activeArea.containsPoint(point, Qt::OddEvenFill)) {
return RotateButton; return RotateButton;
} }
return NoButton; kDebug() << "base point is" << basePoint << "and applet is" << m_applet->mapToParent(m_applet->boundingRect());
return m_applet->mapToParent(m_applet->shape()).contains(point) ? NoButton : MoveButton;
} }
void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event) void AppletHandle::mousePressEvent(QGraphicsSceneMouseEvent *event)
@ -293,7 +294,7 @@ void AppletHandle::startFading(FadeType anim)
Phase::self()->stopCustomAnimation(m_animId); Phase::self()->stopCustomAnimation(m_animId);
} }
qreal time = 500; qreal time = 250;
if (anim==FadeIn) { if (anim==FadeIn) {
time *= 1.0-m_opacity; time *= 1.0-m_opacity;

4
applethandle_p.h
View File

@ -60,6 +60,10 @@ class AppletHandle : public QObject, public QGraphicsItem
void fadeAnimation(qreal progress); void fadeAnimation(qreal progress);
private: private:
static const int HANDLE_WIDTH = 10;
static const int ICON_SIZE = 12;
static const int ICON_MARGIN = 6;
void startFading(FadeType anim); void startFading(FadeType anim);
void forceDisappear(); void forceDisappear();
ButtonType mapToButton(const QPointF &point) const; ButtonType mapToButton(const QPointF &point) const;