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

don't jitter when moving between buttons

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=758535
This commit is contained in:
Aaron J. Seigo 2008-01-08 05:04:11 +00:00
parent f7d3a27b1e
commit 36b786137e
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desktoptoolbox.cpp
View File

@ -115,15 +115,20 @@ QPainterPath DesktopToolbox::shape() const
void DesktopToolbox::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
if (m_showing) {
QGraphicsItem::hoverEnterEvent(event);
return;
}
int maxwidth = 0;
foreach (QGraphicsItem* tool, QGraphicsItem::children()) {
if (!tool->isEnabled()) {
continue;
}
maxwidth = qMax(static_cast<int>(tool->boundingRect().width()),
maxwidth);
maxwidth = qMax(static_cast<int>(tool->boundingRect().width()), maxwidth);
}
// put tools 5px from screen edge
// put tools 5px from icon edge
const int iconWidth = 32;
int x = m_size*2 - maxwidth - iconWidth - 5;
int y = 5; // pos().y();
@ -140,6 +145,9 @@ void DesktopToolbox::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
y += static_cast<int>(tool->boundingRect().height()) + 5;
}
//NOTE: this will not work if the item is rotated, but this way we don't need use a QRegion
m_toolsRect = QRect(mapToScene(QPoint(x, 5)).toPoint(), QSize(maxwidth, y - 10)).adjusted(1, 1, -1, -1);
if (m_animId) {
phase->stopCustomAnimation(m_animId);
}
@ -153,6 +161,12 @@ void DesktopToolbox::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
void DesktopToolbox::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
//kDebug() << m_toolsRect << event->pos() << event->scenePos() << m_toolsRect.contains(event->scenePos().toPoint());
if (!m_toolsRect.isNull() && m_toolsRect.contains(event->scenePos().toPoint())) {
QGraphicsItem::hoverLeaveEvent(event);
return;
}
int x = m_size*2;
int y = 0;
Plasma::Phase* phase = Plasma::Phase::self();
@ -167,6 +181,7 @@ void DesktopToolbox::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
m_showing = false;
m_animId = phase->customAnimation(10, 150, Plasma::Phase::EaseOutCurve, this, "animate");
m_toolsRect = QRect();
QGraphicsItem::hoverLeaveEvent(event);
}

3
desktoptoolbox_p.h
View File

@ -57,7 +57,8 @@ protected slots:
private:
KIcon m_icon;
int m_size;
const int m_size;
QRect m_toolsRect;
bool m_hidden;
bool m_showing;
Plasma::Phase::AnimId m_animId;