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

CppEditor: Fix position of virtual override list

Browse Source 
...when using the mouse (Ctrl + Left click).

Task-number: QTCREATORBUG-10479

Change-Id: I54a21c449d8bb8e608d383752beb3b31c9c81783
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-10-23 16:02:18 +02:00
parent 61c0de88c2
commit 0c62b29f97
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
View File

@@ -560,6 +560,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
params.startClass = klass; params.startClass = klass;
params.function = function; params.function = function;
params.snapshot = snapshot; params.snapshot = snapshot;
params.cursorPosition = cursor.position();
params.openInNextSplit = inNextSplit; params.openInNextSplit = inNextSplit;
if (m_virtualFunctionAssistProvider->configure(params)) { if (m_virtualFunctionAssistProvider->configure(params)) {

10
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -113,9 +113,8 @@ public:
: m_params(params) : m_params(params)
{} {}
IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *assistInterface) IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *)
{ {
QTC_ASSERT(assistInterface, return 0);
QTC_ASSERT(m_params.function, return 0); QTC_ASSERT(m_params.function, return 0);
BasicProposalItem *hintItem = new VirtualFunctionProposalItem(CPPEditorWidget::Link()); BasicProposalItem *hintItem = new VirtualFunctionProposalItem(CPPEditorWidget::Link());
@@ -126,14 +125,13 @@ public:
QList<BasicProposalItem *> items; QList<BasicProposalItem *> items;
items << itemFromSymbol(maybeDefinitionFor(m_params.function)); items << itemFromSymbol(maybeDefinitionFor(m_params.function));
items << hintItem; items << hintItem;
return new VirtualFunctionProposal(assistInterface->position(), return new VirtualFunctionProposal(m_params.cursorPosition,
new BasicProposalItemListModel(items), new BasicProposalItemListModel(items),
m_params.openInNextSplit); m_params.openInNextSplit);
} }
IAssistProposal *perform(const IAssistInterface *assistInterface) IAssistProposal *perform(const IAssistInterface *)
{ {
QTC_ASSERT(assistInterface, return 0);
QTC_ASSERT(m_params.startClass, return 0); QTC_ASSERT(m_params.startClass, return 0);
QTC_ASSERT(m_params.function, return 0); QTC_ASSERT(m_params.function, return 0);
QTC_ASSERT(!m_params.snapshot.isEmpty(), return 0); QTC_ASSERT(!m_params.snapshot.isEmpty(), return 0);
@@ -148,7 +146,7 @@ public:
items << itemFromSymbol(maybeDefinitionFor(symbol)); items << itemFromSymbol(maybeDefinitionFor(symbol));
items.first()->setOrder(1000); // Ensure top position for function of static type items.first()->setOrder(1000); // Ensure top position for function of static type
return new VirtualFunctionProposal(assistInterface->position(), return new VirtualFunctionProposal(m_params.cursorPosition,
new BasicProposalItemListModel(items), new BasicProposalItemListModel(items),
m_params.openInNextSplit); m_params.openInNextSplit);
} }

3
src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
View File

@@ -46,11 +46,12 @@ public:
VirtualFunctionAssistProvider(); VirtualFunctionAssistProvider();
struct Parameters { struct Parameters {
Parameters() : startClass(0), function(0), openInNextSplit(false) {} Parameters() : startClass(0), function(0), cursorPosition(-1), openInNextSplit(false) {}
CPlusPlus::Class *startClass; CPlusPlus::Class *startClass;
CPlusPlus::Function *function; CPlusPlus::Function *function;
CPlusPlus::Snapshot snapshot; CPlusPlus::Snapshot snapshot;
int cursorPosition;
bool openInNextSplit; bool openInNextSplit;
}; };