Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Code Releases Activity

LineEdit: Don't query clipboard when its contents changes

Browse Source 
Apparently it can hang in QXcbClipboard

Closes #1945
This commit is contained in:
David Rosca 2017-10-31 18:24:10 +01:00
parent 845d59e5d7
commit dcf1cfd96e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/3rdparty/lineedit.cpp vendored
View File

@ -163,10 +163,8 @@ void LineEdit::init()
// Connections to update edit actions // Connections to update edit actions
connect(this, SIGNAL(textChanged(QString)), this, SLOT(updateActions())); connect(this, SIGNAL(textChanged(QString)), this, SLOT(updateActions()));
connect(this, SIGNAL(selectionChanged()), this, SLOT(updateActions())); connect(this, SIGNAL(selectionChanged()), this, SLOT(updateActions()));
connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(updatePasteActions()));
updateActions(); updateActions();
updatePasteActions();
} }
bool LineEdit::event(QEvent* event) bool LineEdit::event(QEvent* event)
@ -205,11 +203,11 @@ QMenu* LineEdit::createContextMenu()
popup->addAction(m_editActions[Copy]); popup->addAction(m_editActions[Copy]);
if (!isReadOnly()) { if (!isReadOnly()) {
updatePasteActions();
popup->addAction(m_editActions[Paste]); popup->addAction(m_editActions[Paste]);
if (!m_editActions[PasteAndGo]->text().isEmpty()) {
if (!m_editActions[PasteAndGo]->text().isEmpty())
popup->addAction(m_editActions[PasteAndGo]); popup->addAction(m_editActions[PasteAndGo]);
}
popup->addAction(m_editActions[Delete]); popup->addAction(m_editActions[Delete]);
popup->addAction(m_editActions[ClearAll]); popup->addAction(m_editActions[ClearAll]);
} }
@ -238,6 +236,8 @@ void LineEdit::updateActions()
m_editActions[Copy]->setEnabled(hasSelectedText() && echoMode() == QLineEdit::Normal); m_editActions[Copy]->setEnabled(hasSelectedText() && echoMode() == QLineEdit::Normal);
m_editActions[Delete]->setEnabled(!isReadOnly() && hasSelectedText()); m_editActions[Delete]->setEnabled(!isReadOnly() && hasSelectedText());
m_editActions[SelectAll]->setEnabled(!text().isEmpty() && selectedText() != text()); m_editActions[SelectAll]->setEnabled(!text().isEmpty() && selectedText() != text());
m_editActions[Paste]->setEnabled(true);
m_editActions[PasteAndGo]->setEnabled(true);
} }
void LineEdit::updatePasteActions() void LineEdit::updatePasteActions()