Commit 95b69330 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

backport commit # 6d4982eb from git/master to frameworks branch

CCBUGS: 336127
parent 88f8ad68
......@@ -85,17 +85,18 @@ AdvancedRenameLineEdit::~AdvancedRenameLineEdit()
void AdvancedRenameLineEdit::setupWidgets()
{
setStyleSheet("background:transparent");
setLineWrapMode(QPlainTextEdit::NoWrap);
setWordWrapMode(QTextOption::NoWrap);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setFocusPolicy(Qt::StrongFocus);
setFrameStyle(QFrame::NoFrame);
setPalette(qApp->palette());
setFocusPolicy(Qt::StrongFocus);
QFontMetrics fm = fontMetrics();
int widgetHeight = fm.boundingRect(DUMMY_TEXT).height();
setMinimumHeight(widgetHeight * 2);
int textHeight = fm.boundingRect(DUMMY_TEXT).height();
setFixedHeight(textHeight + fm.leading() + 8);
// --------------------------------------------------------
......@@ -349,7 +350,9 @@ void AdvancedRenameInput::setupWidgets()
d->proxy = new ProxyLineEdit(this);
d->proxy->setWidget(d->lineEdit);
d->proxy->setClearButtonShown(true);
d->proxy->setContentsMargins(0, -2, 0, 2);
setMinimumHeight(d->lineEdit->height() + 2);
setLineEdit(d->proxy);
}
......
......@@ -158,7 +158,7 @@ void Highlighter::setupHighlightingGrammar()
// --------------------------------------------------------
quotationFormat.setForeground(Qt::blue);
quotationFormat.setForeground(QColor("#5050ff")); // light blue
quotationFormat.setFontItalic(true);
quotationRule.pattern = QRegExp("\".*\"");
quotationRule.pattern.setMinimal(true);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment