diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-02 12:36:34 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-08 09:34:06 +0200 |
| commit | 3c34f95ad4a96737f66ab4933edb9e00abecdc24 (patch) | |
| tree | 3249d3d1680a0f63e684a9564edff85cc51cc3dd /src/webenginewidgets | |
| parent | 76846a183e956abfa1ae950a6fe9e58edfeb2a56 (diff) | |
Disable Cut/Copy/Unselect actions when there's no selection
Fixes: QTBUG-76666
Change-Id: I74b9a26cd7be9a830f4eecd36db69777412ab316
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 4658a4739..6e517c6c8 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -260,7 +260,10 @@ void QWebEnginePagePrivate::didUpdateTargetURL(const QUrl &hoveredUrl) void QWebEnginePagePrivate::selectionChanged() { Q_Q(QWebEnginePage); - QTimer::singleShot(0, q, &QWebEnginePage::selectionChanged); + QTimer::singleShot(0, q, [this, q]() { + updateEditActions(); + Q_EMIT q->selectionChanged(); + }); } void QWebEnginePagePrivate::recentlyAudibleChanged(bool recentlyAudible) @@ -594,12 +597,14 @@ void QWebEnginePagePrivate::updateAction(QWebEnginePage::WebAction action) const break; case QWebEnginePage::Cut: case QWebEnginePage::Copy: + case QWebEnginePage::Unselect: + enabled = adapter->hasFocusedFrame() && !adapter->selectedText().isEmpty(); + break; case QWebEnginePage::Paste: case QWebEnginePage::Undo: case QWebEnginePage::Redo: case QWebEnginePage::SelectAll: case QWebEnginePage::PasteAndMatchStyle: - case QWebEnginePage::Unselect: enabled = adapter->hasFocusedFrame(); break; default: |