feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
This commit is contained in:
con
2011-04-01 09:53:09 +02:00
parent 12fd1dbb70 eb03bd1a93
commit 1c2da511b9
140 changed files with 1139 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -1245,12 +1245,27 @@ void DebuggerToolTipManager::moveToolTipsBy(const QPoint &distance)
tw->move (tw->pos() + distance);
}
bool DebuggerToolTipManager::eventFilter(QObject *, QEvent *e)
bool DebuggerToolTipManager::eventFilter(QObject *o, QEvent *e)
{
// Move along with parent (toplevel)
if (e->type() == QEvent::Move && hasToolTips()) {
if (!hasToolTips())
return false;
switch (e->type()) {
case QEvent::Move: { // Move along with parent (toplevel)
const QMoveEvent *me = static_cast<const QMoveEvent *>(e);
moveToolTipsBy(me->pos() - me->oldPos());
}
break;
case QEvent::WindowStateChange: { // Hide/Show along with parent (toplevel)
const QWindowStateChangeEvent *se = static_cast<const QWindowStateChangeEvent *>(e);
const bool wasMinimized = se->oldState() & Qt::WindowMinimized;
const bool isMinimized = static_cast<const QWidget *>(o)->windowState() & Qt::WindowMinimized;
if (wasMinimized ^ isMinimized)
foreach (const QPointer<AbstractDebuggerToolTipWidget> &tw, purgeClosedToolTips())
tw->setVisible(!isMinimized);
}
break;
default:
break;
}
return false;
}