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

Showing asterisk on EditorToolbar for unsaved files with long names

Browse Source 
Task-number: QTCREATORBUG-8003

Change-Id: If9ac6d75123e65486ff0cf243c9537805f3fe5a3
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Vasiliy Sorokin
2012-10-11 11:18:26 +04:00
committed by David Schulz
parent 67b0637934
commit a134076062
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/editortoolbar.cpp
View File

@@ -134,6 +134,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
connect(d->m_goForwardAction, SIGNAL(triggered()), this, SIGNAL(goForwardClicked())); connect(d->m_goForwardAction, SIGNAL(triggered()), this, SIGNAL(goForwardClicked()));
d->m_editorList->setProperty("hideicon", true); d->m_editorList->setProperty("hideicon", true);
d->m_editorList->setProperty("notelideasterisk", true);
d->m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); d->m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
d->m_editorList->setMinimumContentsLength(20); d->m_editorList->setMinimumContentsLength(20);
d->m_editorList->setModel(d->m_editorsListModel); d->m_editorList->setModel(d->m_editorsListModel);

15
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -718,7 +718,20 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
editRect.adjust(0, 0, -13, 0); editRect.adjust(0, 0, -13, 0);
} }
QString text = option->fontMetrics.elidedText(cb->currentText, Qt::ElideRight, editRect.width()); QLatin1Char asterisk('*');
int elideWidth = editRect.width();
bool notElideAsterisk = widget && widget->property("notelideasterisk").toBool()
&& cb->currentText.endsWith(asterisk)
&& option->fontMetrics.width(cb->currentText) > elideWidth;
QString text;
if (notElideAsterisk) {
elideWidth -= option->fontMetrics.width(asterisk);
text = asterisk;
}
text.prepend(option->fontMetrics.elidedText(cb->currentText, Qt::ElideRight, elideWidth));
if ((option->state & State_Enabled)) { if ((option->state & State_Enabled)) {
painter->setPen(QColor(0, 0, 0, 70)); painter->setPen(QColor(0, 0, 0, 70));
painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, text); painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, text);