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

Put some space between completion info tooltip and delay appearing

Browse Source 
Done with mae and Jens Bache-Wiig.
This commit is contained in:
Thorbjørn Lindeijer
2010-04-15 14:34:31 +02:00
parent 7fc5c4173d
commit 2cebfd001f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/texteditor/completionwidget.cpp
View File

@@ -45,7 +45,6 @@
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QStylePainter> #include <QtGui/QStylePainter>
#include <QtGui/QToolTip> #include <QtGui/QToolTip>
#include <QtCore/QTimer>
#include <limits.h> #include <limits.h>
@@ -256,6 +255,10 @@ CompletionListView::CompletionListView(CompletionSupport *support, ITextEditable
{ {
QTC_ASSERT(m_editorWidget, return); QTC_ASSERT(m_editorWidget, return);
m_infoTimer.setInterval(1000);
m_infoTimer.setSingleShot(true);
connect(&m_infoTimer, SIGNAL(timeout()), SLOT(maybeShowInfoTip()));
setAttribute(Qt::WA_MacShowFocusRect, false); setAttribute(Qt::WA_MacShowFocusRect, false);
setUniformItemSizes(true); setUniformItemSizes(true);
setSelectionBehavior(QAbstractItemView::SelectItems); setSelectionBehavior(QAbstractItemView::SelectItems);
@@ -269,7 +272,6 @@ CompletionListView::CompletionListView(CompletionSupport *support, ITextEditable
if (verticalScrollBar()) if (verticalScrollBar())
verticalScrollBar()->setAttribute(Qt::WA_MacMiniSize); verticalScrollBar()->setAttribute(Qt::WA_MacMiniSize);
#endif #endif
} }
CompletionListView::~CompletionListView() CompletionListView::~CompletionListView()
@@ -285,6 +287,7 @@ void CompletionListView::maybeShowInfoTip()
if (infoTip.isEmpty()) { if (infoTip.isEmpty()) {
delete m_infoFrame.data(); delete m_infoFrame.data();
m_infoTimer.setInterval(200);
return; return;
} }
@@ -295,19 +298,21 @@ void CompletionListView::maybeShowInfoTip()
QRect r = rectForIndex(current); QRect r = rectForIndex(current);
m_infoFrame->move( m_infoFrame->move(
(parentWidget()->mapToGlobal( (parentWidget()->mapToGlobal(
parentWidget()->rect().topRight() + QPoint(0, 0))).x(), parentWidget()->rect().topRight())).x() + 3,
mapToGlobal(r.topRight()).y() - verticalOffset() mapToGlobal(r.topRight()).y() - verticalOffset()
); );
m_infoFrame->setText(infoTip); m_infoFrame->setText(infoTip);
m_infoFrame->adjustSize(); m_infoFrame->adjustSize();
m_infoFrame->show(); m_infoFrame->show();
m_infoFrame->raise(); m_infoFrame->raise();
m_infoTimer.setInterval(0);
} }
void CompletionListView::currentChanged(const QModelIndex &current, const QModelIndex &previous) void CompletionListView::currentChanged(const QModelIndex &current, const QModelIndex &previous)
{ {
QListView::currentChanged(current, previous); QListView::currentChanged(current, previous);
QTimer::singleShot(0, this, SLOT(maybeShowInfoTip())); m_infoTimer.start();
} }

4
src/plugins/texteditor/completionwidget.h
View File

@@ -31,7 +31,8 @@
#define COMPLETIONWIDGET_H #define COMPLETIONWIDGET_H
#include <QtGui/QListView> #include <QtGui/QListView>
#include <QPointer> #include <QtCore/QPointer>
#include <QtCore/QTimer>
namespace TextEditor { namespace TextEditor {
@@ -113,6 +114,7 @@ private:
AutoCompletionModel *m_model; AutoCompletionModel *m_model;
CompletionSupport *m_support; CompletionSupport *m_support;
QPointer<CompletionInfoFrame> m_infoFrame; QPointer<CompletionInfoFrame> m_infoFrame;
QTimer m_infoTimer;
}; };
} // namespace Internal } // namespace Internal