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

- some code rewriting in calculate size to become more readable

Browse Source 
- use m_applet->contentsRect().top() for positionning the top of applet handle
- increase a little the leave interval timer to let the user reach the applet handle a little more easily


svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=829263
This commit is contained in:
Loic Marteau 2008-07-07 22:59:03 +00:00
parent 0e5f15dc50
commit 4b36ec4560
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
applethandle.cpp
View File

@ -97,7 +97,7 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet)
m_leaveTimer = new QTimer(this); m_leaveTimer = new QTimer(this);
m_leaveTimer->setSingleShot(true); m_leaveTimer->setSingleShot(true);
m_leaveTimer->setInterval(333); m_leaveTimer->setInterval(500);
connect(m_hoverTimer, SIGNAL(timeout()), this, SLOT(fadeIn())); connect(m_hoverTimer, SIGNAL(timeout()), this, SLOT(fadeIn()));
connect(m_leaveTimer, SIGNAL(timeout()), this, SLOT(leaveTimeout())); connect(m_leaveTimer, SIGNAL(timeout()), this, SLOT(leaveTimeout()));
@ -776,28 +776,22 @@ void AppletHandle::calculateSize()
requiredHeight += (ICON_SIZE + ICON_MARGIN); requiredHeight += (ICON_SIZE + ICON_MARGIN);
} }
int top = m_applet->contentsRect().top();
if (requiredHeight > m_applet->size().height()) {
top += (m_applet->contentsRect().height() - requiredHeight) / 2.0;
}
if (m_applet->pos().x() <= (HANDLE_WIDTH * 2)) { if (m_applet->pos().x() <= (HANDLE_WIDTH * 2)) {
//put the rect on the right of the applet //put the rect on the right of the applet
if (requiredHeight > m_applet->size().height()) { m_rect = QRectF(m_applet->size().width(), top, HANDLE_WIDTH, requiredHeight);
m_rect = QRectF(m_applet->size().width(), (m_applet->size().height() - requiredHeight) / 2.0, HANDLE_WIDTH, requiredHeight);
}
else {
m_rect = QRectF(m_applet->size().width(), 0, HANDLE_WIDTH, requiredHeight);
}
m_rect = m_applet->mapToParent(m_rect).boundingRect();
m_buttonsOnRight = true; m_buttonsOnRight = true;
} else { } else {
//put the rect on the left of the applet //put the rect on the left of the applet
if (requiredHeight > m_applet->size().height()) { m_rect = QRectF(- HANDLE_WIDTH, top, HANDLE_WIDTH, requiredHeight);
m_rect = QRectF(- HANDLE_WIDTH, (m_applet->size().height() - requiredHeight) / 2.0, HANDLE_WIDTH, requiredHeight);
}
else {
m_rect = QRectF(- HANDLE_WIDTH, 0, HANDLE_WIDTH, requiredHeight);
}
m_rect = m_applet->mapToParent(m_rect).boundingRect();
} }
m_rect = m_applet->mapToParent(m_rect).boundingRect();
m_totalRect = m_rect.united(m_applet->geometry()); m_totalRect = m_rect.united(m_applet->geometry());
} }