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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
This commit is contained in:
Eike Ziller
2016-01-19 16:41:17 +01:00
parent aa37df645d f8d4e4954b
commit 98257617e9
14 changed files with 130 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -168,6 +168,11 @@ public:
m_label->setText(text);
}
void setTextFormat(Qt::TextFormat textFormat)
{
m_label->setTextFormat(textFormat);
}
// Workaround QTCREATORBUG-11653
void calculateMaximumWidth()
{
@@ -311,6 +316,7 @@ void GenericProposalWidgetPrivate::maybeShowInfoTip()
m_infoFrame->move(m_completionListView->infoFramePos());
m_infoFrame->setText(infoTip);
m_infoFrame->setTextFormat(m_model->detailTextFormat());
m_infoFrame->calculateMaximumWidth();
m_infoFrame->adjustSize();
m_infoFrame->show();