Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[LocationBar] Fixed rendering selected text with visible popup completer.

Browse Source
This commit is contained in:
nowrep 2013-12-23 19:21:47 +01:00
parent 7e088d0f1d
commit ed8ec5ab4a
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/navigation/locationbar.cpp
View File

@ -442,6 +442,14 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
}
break;
case Qt::Key_A:
if (event->modifiers() == Qt::ControlModifier) {
if (m_inlineCompletionVisible) {
m_inlineCompletionVisible = false;
}
}
break;
case Qt::Key_Down:
m_completer.complete(text());
break;
@ -664,7 +672,17 @@ void LocationBar::paintEvent(QPaintEvent* event)
cursor.setHeight(cursorHeight);
style()->drawPrimitive(QStyle::PE_PanelLineEdit, &option, &p, this);
p.drawText(textRect, text(), opt);
QRect actualTextRect = textRect;
actualTextRect.setWidth(fontMetrics().width(text()) + 1);
// When popup is visible, Ctrl + A (Select All) is the only way to select text
if (selectedText() == text()) {
p.fillRect(actualTextRect, palette().color(QPalette::Highlight));
p.setPen(palette().color(QPalette::HighlightedText));
}
p.drawText(actualTextRect, text(), opt);
if (textRect.contains(cursor.center().x(), cursor.center().y())) {
p.fillRect(cursor, option.palette.text().color());