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

finish merge conflicts

Browse Source
This commit is contained in:
Aaron Seigo 2011-12-04 14:34:06 +01:00
parent 71d807c353
commit 04854068fc
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -182,6 +182,9 @@ set(plasma_LIB_SRCS
) )
set (plasmaqgv_LIB_SRCS set (plasmaqgv_LIB_SRCS
#FIXME: this is duplicated with libplasma because iconwidget requires it!
private/themedwidgetinterface.cpp
graphicsview/graphicsviewappletprivate.cpp graphicsview/graphicsviewappletprivate.cpp
animator.cpp animator.cpp
animations/animation.cpp animations/animation.cpp

8
tooltipmanager.cpp
View File

@ -248,10 +248,6 @@ void ToolTipManager::setContent(QGraphicsWidget *widget, const ToolTipContent &d
//look if the data prefers aother graphicswidget, otherwise use the one used as event catcher //look if the data prefers aother graphicswidget, otherwise use the one used as event catcher
QGraphicsWidget *referenceWidget = data.graphicsWidget() ? data.graphicsWidget() : widget; QGraphicsWidget *referenceWidget = data.graphicsWidget() ? data.graphicsWidget() : widget;
Corona *corona = qobject_cast<Corona *>(referenceWidget->scene()); Corona *corona = qobject_cast<Corona *>(referenceWidget->scene());
if (!corona) {
// fallback to the corona we were given
corona = m_corona;
}
if (corona) { if (corona) {
d->tipWidget->moveTo(corona->popupPosition(referenceWidget, d->tipWidget->size(), Qt::AlignCenter)); d->tipWidget->moveTo(corona->popupPosition(referenceWidget, d->tipWidget->size(), Qt::AlignCenter));
@ -408,10 +404,6 @@ void ToolTipManagerPrivate::showToolTip()
tipWidget->prepareShowing(); tipWidget->prepareShowing();
QGraphicsWidget *referenceWidget = tooltip.value().graphicsWidget() ? tooltip.value().graphicsWidget() : currentWidget; QGraphicsWidget *referenceWidget = tooltip.value().graphicsWidget() ? tooltip.value().graphicsWidget() : currentWidget;
Corona *corona = qobject_cast<Corona *>(referenceWidget->scene()); Corona *corona = qobject_cast<Corona *>(referenceWidget->scene());
if (!corona) {
// fallback to the corona we were given
corona = q->m_corona;
}
if (corona) { if (corona) {
tipWidget->moveTo(corona->popupPosition(referenceWidget, tipWidget->size(), Qt::AlignCenter)); tipWidget->moveTo(corona->popupPosition(referenceWidget, tipWidget->size(), Qt::AlignCenter));