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

VariableChooser: Add support for (plain) text edits

Browse Source 
Task-number: QTCREATORBUG-4309
Change-Id: I3d81244fe380bdf79e108f41c2c06df88b116137
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-06-05 08:27:17 +02:00
parent b35ddc57ed
commit 8cb25f9e3e
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -173,6 +173,7 @@ void VariableChooser::updateCurrentEditor(QWidget *old, QWidget *widget)
return; return;
widget->installEventFilter(this); // for intercepting escape key presses widget->installEventFilter(this); // for intercepting escape key presses
QLineEdit *previousLineEdit = m_lineEdit; QLineEdit *previousLineEdit = m_lineEdit;
QWidget *previousWidget = currentWidget();
m_lineEdit = 0; m_lineEdit = 0;
m_textEdit = 0; m_textEdit = 0;
m_plainTextEdit = 0; m_plainTextEdit = 0;
@@ -187,23 +188,27 @@ void VariableChooser::updateCurrentEditor(QWidget *old, QWidget *widget)
m_plainTextEdit = (supportsVariables ? plainTextEdit : 0); m_plainTextEdit = (supportsVariables ? plainTextEdit : 0);
if (!(m_lineEdit || m_textEdit || m_plainTextEdit)) if (!(m_lineEdit || m_textEdit || m_plainTextEdit))
hide(); hide();
if (m_lineEdit != previousLineEdit) {
QWidget *current = currentWidget();
if (current != previousWidget) {
if (previousLineEdit) if (previousLineEdit)
previousLineEdit->setTextMargins(0, 0, 0, 0); previousLineEdit->setTextMargins(0, 0, 0, 0);
if (m_iconButton) { if (m_iconButton) {
m_iconButton->hide(); m_iconButton->hide();
m_iconButton->setParent(0); m_iconButton->setParent(0);
} }
if (m_lineEdit) { if (current) {
if (!m_iconButton) if (!m_iconButton)
createIconButton(); createIconButton();
int margin = m_iconButton->pixmap().width() + 8; int margin = m_iconButton->pixmap().width() + 8;
if (style()->inherits("OxygenStyle")) if (style()->inherits("OxygenStyle"))
margin = qMax(24, margin); margin = qMax(24, margin);
m_lineEdit->setTextMargins(0, 0, margin, 0); if (m_lineEdit)
m_iconButton->setParent(m_lineEdit); m_lineEdit->setTextMargins(0, 0, margin, 0);
m_iconButton->setGeometry(m_lineEdit->rect().adjusted( m_iconButton->setParent(current);
m_lineEdit->width() - (margin + 4), 0, 0, 0)); m_iconButton->setGeometry(current->rect().adjusted(
current->width() - (margin + 4), 0,
0, -qMax(0, current->height() - (margin + 4))));
m_iconButton->show(); m_iconButton->show();
} }
} }
@@ -235,6 +240,18 @@ void VariableChooser::updatePositionAndShow()
activateWindow(); activateWindow();
} }
/*!
* \internal
*/
QWidget *VariableChooser::currentWidget()
{
if (m_lineEdit)
return m_lineEdit;
if (m_textEdit)
return m_textEdit;
return m_plainTextEdit;
}
/*! /*!
* \internal * \internal
*/ */

1
src/plugins/coreplugin/variablechooser.h
View File

@@ -71,6 +71,7 @@ private slots:
void updatePositionAndShow(); void updatePositionAndShow();
private: private:
QWidget *currentWidget();
void createIconButton(); void createIconButton();
Internal::Ui::VariableChooser *ui; Internal::Ui::VariableChooser *ui;