diff options
| author | Elvis Angelaccio <[email protected]> | 2020-01-11 16:15:14 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-01-11 16:15:14 +0100 |
| commit | 10d6556373fdbfa7b28d278657dbce47c21073aa (patch) | |
| tree | e5f2ca2edb4eb304453bd4b68e7a3cd13531338c /src | |
| parent | 41105103b063c2e538bf0071e54fd429a841238b (diff) | |
| parent | f729f6f5b1d1bbc1b4fab2f925f16f2c2c7128d5 (diff) | |
Merge branch 'release/19.12'
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/org.kde.dolphin.appdata.xml | 1 | ||||
| -rw-r--r-- | src/views/dolphinview.h | 10 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index a7587a91c..9ed7654fa 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -510,6 +510,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible) { Q_ASSERT(m_filterBar); if (visible) { + m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly); m_filterBar->show(); m_filterBar->setFocus(); m_filterBar->selectAll(); @@ -659,6 +660,7 @@ void DolphinViewContainer::closeFilterBar() void DolphinViewContainer::setNameFilter(const QString& nameFilter) { + m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly); m_view->setNameFilter(nameFilter); delayedStatusBarUpdate(); } diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 87e0064f6..751cad526 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -580,6 +580,7 @@ <binary>dolphin</binary> </provides> <releases> + <release version="19.12.1" date="2020-01-09"/> <release version="19.12.0" date="2019-12-12"/> </releases> </component> diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index ba38d3234..538e00e83 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -312,6 +312,11 @@ public: */ static QUrl openItemAsFolderUrl(const KFileItem& item, const bool browseThroughArchives = true); + /** + * Hides tooltip displayed over element. + */ + void hideToolTip(const ToolTipManager::HideBehavior behavior = ToolTipManager::HideBehavior::Later); + public slots: /** * Changes the directory to \a url. If the current directory is equal to @@ -738,11 +743,6 @@ private: void applyModeToView(); /** - * Hides tooltip displayed over element. - */ - void hideToolTip(const ToolTipManager::HideBehavior behavior = ToolTipManager::HideBehavior::Later); - - /** * Helper method for DolphinView::paste() and DolphinView::pasteIntoFolder(). * Pastes the clipboard data into the URL \a url. */ |