File 2005-quick-open-window-popup.patch of Package kate

Overview Repositories Revisions Requests Users Attributes Meta

File 2005-quick-open-window-popup.patch of Package kate (Revision b7d2ae64444632db4c3cf3a017839ace)

Currently displaying revision b7d2ae64444632db4c3cf3a017839ace , Show latest

diff --git a/apps/lib/katemainwindow.cpp b/apps/lib/katemainwindow.cpp
index a054a39504be1a25689533345148b65491edb6e3..0331cbd4c88ed1a1796ec7eb73184cfc39d81560 100644
--- a/apps/lib/katemainwindow.cpp
+++ b/apps/lib/katemainwindow.cpp
@@ -1534,8 +1534,6 @@ void KateMainWindow::slotQuickOpen()
      * show quick open and pass focus to it
      */
     KateQuickOpen *quickOpen = new KateQuickOpen(this);
-    centralWidget()->setFocusProxy(quickOpen);
-    quickOpen->raise();
     quickOpen->show();
 }
 
diff --git a/apps/lib/quickopen/katequickopen.cpp b/apps/lib/quickopen/katequickopen.cpp
index 627fcf2b3d4c6510960a9a0af68248ad64467184..542303dc35d5dc030f84d86e4e78b2962b8a491c 100644
--- a/apps/lib/quickopen/katequickopen.cpp
+++ b/apps/lib/quickopen/katequickopen.cpp
@@ -30,6 +30,52 @@
 #include <drawing_utils.h>
 #include <kfts_fuzzy_match.h>
 
+static QRect getQuickOpenBoundingRect(KateMainWindow *mainWindow)
+{
+    QRect boundingRect = mainWindow->contentsRect();
+
+    // exclude the menu bar from the bounding rect
+    if (const QWidget *menuWidget = mainWindow->menuWidget()) {
+        if (!menuWidget->isHidden()) {
+            boundingRect.setTop(boundingRect.top() + menuWidget->height());
+        }
+    }
+
+    // exclude the status bar from the bounding rect
+    if (const QWidget *statusBar = mainWindow->findChild<QWidget *>(QStringLiteral("KateStatusBar"))) {
+        if (!statusBar->isHidden()) {
+            boundingRect.setBottom(boundingRect.bottom() - statusBar->height());
+        }
+    }
+
+    // exclude any undocked toolbar from the bounding rect
+    const QList<QToolBar *> toolBars = mainWindow->findChildren<QToolBar *>();
+    for (QToolBar *toolBar : toolBars) {
+        if (toolBar->isHidden() || toolBar->isFloating()) {
+            continue;
+        }
+
+        switch (mainWindow->toolBarArea(toolBar)) {
+        case Qt::TopToolBarArea:
+            boundingRect.setTop(std::max(boundingRect.top(), toolBar->geometry().bottom()));
+            break;
+        case Qt::RightToolBarArea:
+            boundingRect.setRight(std::min(boundingRect.right(), toolBar->geometry().left()));
+            break;
+        case Qt::BottomToolBarArea:
+            boundingRect.setBottom(std::min(boundingRect.bottom(), toolBar->geometry().top()));
+            break;
+        case Qt::LeftToolBarArea:
+            boundingRect.setLeft(std::max(boundingRect.left(), toolBar->geometry().right()));
+            break;
+        default:
+            break;
+        }
+    }
+
+    return boundingRect.translated(mainWindow->geometry().topLeft());
+}
+
 class QuickOpenFilterProxyModel final : public QSortFilterProxyModel
 {
 public:
@@ -268,16 +314,16 @@ private:
 Q_DECLARE_METATYPE(QPointer<KTextEditor::Document>)
 
 KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
-    : QGroupBox(mainWindow)
+    : QMenu(mainWindow)
     , m_mainWindow(mainWindow)
 {
-    // handle resizing
-    mainWindow->installEventFilter(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    setAttribute(Qt::WA_TranslucentBackground);
 
     // ensure the components have some proper frame
     QVBoxLayout *layout = new QVBoxLayout();
     layout->setSpacing(0);
-    layout->setContentsMargins(2, 2, 2, 2);
+    layout->setContentsMargins(4, 4, 4, 4);
     setLayout(layout);
 
     m_inputLine = new QuickOpenLineEdit(this);
@@ -286,6 +332,7 @@ KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
     layout->addWidget(m_inputLine);
 
     m_listView = new QTreeView(this);
+    m_listView->setFocusPolicy(Qt::NoFocus);
     layout->addWidget(m_listView, 1);
     m_listView->setTextElideMode(Qt::ElideLeft);
     m_listView->setUniformRowHeights(true);
@@ -303,7 +350,6 @@ KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
     connect(m_listView, &QTreeView::clicked, this, &KateQuickOpen::slotReturnPressed); // for single click
 
     m_inputLine->installEventFilter(this);
-    m_listView->installEventFilter(this);
     m_listView->setHeaderHidden(true);
     m_listView->setRootIsDecorated(false);
     m_listView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -330,8 +376,6 @@ KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
         }
     });
 
-    setHidden(true);
-
     setFilterMode();
     m_model->setListMode(m_inputLine->listMode());
 
@@ -341,45 +385,20 @@ KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
 
 bool KateQuickOpen::eventFilter(QObject *obj, QEvent *event)
 {
-    // catch key presses + shortcut overrides to allow to have ESC as application wide shortcut, too, see bug 409856
-    if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride) {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-        if (obj == m_inputLine) {
-            const bool forward2list = (keyEvent->key() == Qt::Key_Up) || (keyEvent->key() == Qt::Key_Down) || (keyEvent->key() == Qt::Key_PageUp)
-                || (keyEvent->key() == Qt::Key_PageDown);
-            if (forward2list) {
-                QCoreApplication::sendEvent(m_listView, event);
-                return true;
-            }
-
-        } else if (obj == m_listView) {
-            const bool forward2input = (keyEvent->key() != Qt::Key_Up) && (keyEvent->key() != Qt::Key_Down) && (keyEvent->key() != Qt::Key_PageUp)
-                && (keyEvent->key() != Qt::Key_PageDown) && (keyEvent->key() != Qt::Key_Tab) && (keyEvent->key() != Qt::Key_Backtab);
-            if (forward2input) {
-                QCoreApplication::sendEvent(m_inputLine, event);
-                return true;
-            }
-        }
-
-        if (keyEvent->key() == Qt::Key_Escape) {
-            hide();
-            deleteLater();
+    if (obj == m_inputLine && event->type() == QEvent::KeyPress) {
+        switch (static_cast<const QKeyEvent *>(event)->key()) {
+        case Qt::Key_Up:
+        case Qt::Key_Down:
+        case Qt::Key_PageUp:
+        case Qt::Key_PageDown:
+            QCoreApplication::sendEvent(m_listView, event);
             return true;
+        default:
+            break;
         }
     }
 
-    if (event->type() == QEvent::FocusOut && !(m_inputLine->hasFocus() || m_listView->hasFocus())) {
-        hide();
-        deleteLater();
-        return true;
-    }
-
-    // handle resizing
-    if (m_mainWindow == obj && event->type() == QEvent::Resize) {
-        updateViewGeometry();
-    }
-
-    return QWidget::eventFilter(obj, event);
+    return QMenu::eventFilter(obj, event);
 }
 
 void KateQuickOpen::reselectFirst()
@@ -399,9 +418,32 @@ void KateQuickOpen::updateState()
     m_model->refresh(m_mainWindow);
     reselectFirst();
 
-    updateViewGeometry();
-    show();
-    setFocus();
+    if (isVisible()) {
+        show();
+    }
+}
+
+void KateQuickOpen::show()
+{
+    const QRect boundingRect = getQuickOpenBoundingRect(m_mainWindow);
+
+    static constexpr int minWidth = 500;
+    const int maxWidth = boundingRect.width();
+    const int preferredWidth = maxWidth / 2.4;
+
+    static constexpr int minHeight = 250;
+    const int maxHeight = boundingRect.height();
+    const int preferredHeight = maxHeight / 2;
+
+    const QSize size{std::min(maxWidth, std::max(preferredWidth, minWidth)), std::min(maxHeight, std::max(preferredHeight, minHeight))};
+
+    setFixedSize(size);
+
+    // set the position to the top-center of the parent
+    // just below the menubar/toolbar (if any)
+    popup(QPoint(boundingRect.center().x() - size.width() / 2, boundingRect.y()));
+
+    activateWindow();
 }
 
 void KateQuickOpen::slotReturnPressed()
@@ -414,6 +456,10 @@ void KateQuickOpen::slotReturnPressed()
 
     // either get view via document pointer or url
     const QModelIndex index = m_listView->currentIndex();
+    if (!index.isValid()) {
+        return;
+    }
+
     KTextEditor::View *view = nullptr;
     if (auto doc = index.data(KateQuickOpenModel::Document).value<KTextEditor::Document *>()) {
         view = m_mainWindow->activateView(doc);
@@ -421,8 +467,12 @@ void KateQuickOpen::slotReturnPressed()
         view = m_mainWindow->wrapper()->openUrl(index.data(Qt::UserRole).toUrl());
     }
 
+    if (!view) {
+        return;
+    }
+
     const auto strs = m_inputLine->text().split(QLatin1Char(':'));
-    if (view && strs.count() > 1) {
+    if (strs.count() > 1) {
         // helper to convert String => Number
         auto stringToInt = [](const QString &s) {
             bool ok = false;
@@ -447,15 +497,11 @@ void KateQuickOpen::slotReturnPressed()
         }
     }
 
-    hide();
-    deleteLater();
-
+    close();
     m_mainWindow->slotWindowActivated();
 
     // store the new position in location history
-    if (view) {
-        vm->addPositionToHistory(view->document()->url(), view->cursorPosition());
-    }
+    vm->addPositionToHistory(view->document()->url(), view->cursorPosition());
 }
 
 void KateQuickOpen::slotListModeChanged(KateQuickOpenModel::List mode)
@@ -476,74 +522,4 @@ void KateQuickOpen::setFilterMode()
     m_listView->viewport()->update();
 }
 
-static QRect getQuickOpenBoundingRect(KateMainWindow *mainWindow)
-{
-    QRect boundingRect = mainWindow->contentsRect();
-
-    // exclude the menu bar from the bounding rect
-    if (const QWidget *menuWidget = mainWindow->menuWidget()) {
-        if (!menuWidget->isHidden()) {
-            boundingRect.setTop(boundingRect.top() + menuWidget->height());
-        }
-    }
-
-    // exclude the status bar from the bounding rect
-    if (const QWidget *statusBar = mainWindow->findChild<QWidget *>(QStringLiteral("KateStatusBar"))) {
-        if (!statusBar->isHidden()) {
-            boundingRect.setBottom(boundingRect.bottom() - statusBar->height());
-        }
-    }
-
-    // exclude any undocked toolbar from the bounding rect
-    const QList<QToolBar *> toolBars = mainWindow->findChildren<QToolBar *>();
-    for (QToolBar *toolBar : toolBars) {
-        if (toolBar->isHidden() || toolBar->isFloating()) {
-            continue;
-        }
-
-        switch (mainWindow->toolBarArea(toolBar)) {
-        case Qt::TopToolBarArea:
-            boundingRect.setTop(std::max(boundingRect.top(), toolBar->geometry().bottom()));
-            break;
-        case Qt::RightToolBarArea:
-            boundingRect.setRight(std::min(boundingRect.right(), toolBar->geometry().left()));
-            break;
-        case Qt::BottomToolBarArea:
-            boundingRect.setBottom(std::min(boundingRect.bottom(), toolBar->geometry().top()));
-            break;
-        case Qt::LeftToolBarArea:
-            boundingRect.setLeft(std::max(boundingRect.left(), toolBar->geometry().right()));
-            break;
-        default:
-            break;
-        }
-    }
-
-    return boundingRect;
-}
-
-void KateQuickOpen::updateViewGeometry()
-{
-    const QRect boundingRect = getQuickOpenBoundingRect(m_mainWindow);
-
-    static constexpr int minWidth = 500;
-    const int maxWidth = boundingRect.width();
-    const int preferredWidth = maxWidth / 2.4;
-
-    static constexpr int minHeight = 250;
-    const int maxHeight = boundingRect.height();
-    const int preferredHeight = maxHeight / 2;
-
-    const QSize size{std::min(maxWidth, std::max(preferredWidth, minWidth)), std::min(maxHeight, std::max(preferredHeight, minHeight))};
-
-    // resize() doesn't work here, so use setFixedSize() instead
-    setFixedSize(size);
-
-    // set the position to the top-center of the parent
-    // just below the menubar/toolbar (if any)
-    const QPoint position{boundingRect.center().x() - size.width() / 2, boundingRect.y()};
-
-    move(position);
-}
-
 #include "moc_katequickopen.cpp"
diff --git a/apps/lib/quickopen/katequickopen.h b/apps/lib/quickopen/katequickopen.h
index 2f447550b7c99b90ea77110a198a7ae83c996dc0..c10649f276169270a0f75a7b637eaeef58e2b4b0 100644
--- a/apps/lib/quickopen/katequickopen.h
+++ b/apps/lib/quickopen/katequickopen.h
@@ -9,7 +9,7 @@
 
 #include "katequickopenlineedit.h"
 
-#include <QGroupBox>
+#include <QMenu>
 
 class KateMainWindow;
 
@@ -23,7 +23,7 @@ enum KateQuickOpenModelList : int;
 
 class QuickOpenFilterProxyModel;
 
-class KateQuickOpen : public QGroupBox
+class KateQuickOpen : public QMenu
 {
     Q_OBJECT
 public:
@@ -34,7 +34,9 @@ public:
      * will fill model with current open documents, project documents, ...
      */
     void updateState();
-    void updateViewGeometry();
+
+public Q_SLOTS:
+    void show();
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override;

Places

File 2005-quick-open-window-popup.patch of Package kate (Revision b7d2ae64444632db4c3cf3a017839ace)

Places