File 2004-better-quick-open-window.patch of Package kate

Overview Repositories Revisions Requests Users Attributes Meta

File 2004-better-quick-open-window.patch of Package kate (Revision 0cd17e9f09c167fb0bc55c2d1c494382)

Currently displaying revision 0cd17e9f09c167fb0bc55c2d1c494382 , 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/katemdi.cpp b/apps/lib/katemdi.cpp
index ecbf4c0027fa27a5e4558105879af9b516b75b1b..e7d96215c4f1147f6edcf13c3d1f01e8253eba8b 100644
--- a/apps/lib/katemdi.cpp
+++ b/apps/lib/katemdi.cpp
@@ -1560,6 +1560,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_bottomSidebarLayout = new QHBoxLayout;
     m_bottomSidebarLayout->addWidget(m_sidebars[KMultiTabBar::Bottom].get());
     m_statusBarStackedWidget = new QStackedWidget(this);
+    m_statusBarStackedWidget->setObjectName(QStringLiteral("KateStatusBar"));
     m_statusBarStackedWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     // button that shows git branch
     // m_branchLabel = new CurrentGitBranchButton(this);
diff --git a/apps/lib/quickopen/katequickopen.cpp b/apps/lib/quickopen/katequickopen.cpp
index 699236a05a783d992f0881568166dbe4a2f5fd2f..ace3e1ff62dcaabbc43a504063f63b3911eb7891 100644
--- a/apps/lib/quickopen/katequickopen.cpp
+++ b/apps/lib/quickopen/katequickopen.cpp
@@ -20,6 +20,7 @@
 
 #include <QCoreApplication>
 #include <QEvent>
+#include <QGraphicsEffect>
 #include <QPainter>
 #include <QPointer>
 #include <QSortFilterProxyModel>
@@ -29,7 +30,6 @@
 
 #include <drawing_utils.h>
 #include <kfts_fuzzy_match.h>
-#include <qgraphicseffect.h>
 
 class QuickOpenFilterProxyModel final : public QSortFilterProxyModel
 {
@@ -269,52 +269,51 @@ private:
 Q_DECLARE_METATYPE(QPointer<KTextEditor::Document>)
 
 KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
-    : QFrame(mainWindow)
+    : QWidget(mainWindow)
     , m_mainWindow(mainWindow)
 {
-    QGraphicsDropShadowEffect *e = new QGraphicsDropShadowEffect(this);
-    e->setColor(palette().color(QPalette::Shadow));
-    e->setOffset(2.);
-    e->setBlurRadius(8.);
-    setGraphicsEffect(e);
+    setAttribute(Qt::WA_DeleteOnClose);
 
-    setAutoFillBackground(true);
-    setFrameShadow(QFrame::Raised);
-    setFrameShape(QFrame::Box);
+    QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
+    effect->setColor(palette().color(QPalette::Dark));
+    effect->setBlurRadius(48);
+    effect->setOffset(0, 4);
+    setGraphicsEffect(effect);
 
     // handle resizing
     mainWindow->installEventFilter(this);
 
     // ensure the components have some proper frame
-    QVBoxLayout *layout = new QVBoxLayout();
+    QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing(0);
-    layout->setContentsMargins(2, 2, 2, 2);
+    layout->setContentsMargins(QMargins() + 1); // for frame
     setLayout(layout);
 
     m_inputLine = new QuickOpenLineEdit(this);
-    setFocusProxy(m_inputLine);
-
+    m_inputLine->setClearButtonEnabled(true);
+    m_inputLine->setContentsMargins(QMargins() + 6);
     layout->addWidget(m_inputLine);
+    setFocusProxy(m_inputLine);
 
     m_listView = new QTreeView(this);
-    layout->addWidget(m_listView, 1);
+    m_listView->setFocusPolicy(Qt::NoFocus);
     m_listView->setTextElideMode(Qt::ElideLeft);
     m_listView->setUniformRowHeights(true);
+    m_listView->setProperty("_breeze_borders_sides", QVariant::fromValue(QFlags(Qt::TopEdge)));
+    layout->addWidget(m_listView);
 
     m_model = new KateQuickOpenModel(this);
     m_styleDelegate = new QuickOpenStyleDelegate(this);
     m_listView->setItemDelegate(m_styleDelegate);
 
     connect(m_inputLine, &QuickOpenLineEdit::textChanged, this, &KateQuickOpen::reselectFirst, Qt::QueuedConnection);
-    connect(m_inputLine, &QuickOpenLineEdit::returnPressed, this, &KateQuickOpen::slotReturnPressed);
     connect(m_inputLine, &QuickOpenLineEdit::listModeChanged, this, &KateQuickOpen::slotListModeChanged);
     connect(m_inputLine, &QuickOpenLineEdit::filterModeChanged, this, &KateQuickOpen::setFilterMode);
 
     connect(m_listView, &QTreeView::activated, this, &KateQuickOpen::slotReturnPressed);
-    connect(m_listView, &QTreeView::clicked, this, &KateQuickOpen::slotReturnPressed); // for single click
+    connect(m_listView, &QTreeView::clicked, m_listView, &QTreeView::activated); // for single click
 
     m_inputLine->installEventFilter(this);
-    m_listView->installEventFilter(this);
     m_listView->setHeaderHidden(true);
     m_listView->setRootIsDecorated(false);
     m_listView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -341,56 +340,77 @@ KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
         }
     });
 
-    setHidden(true);
-
     setFilterMode();
     m_model->setListMode(m_inputLine->listMode());
 
     // fill stuff
-    updateState();
+    refreshModel();
 }
 
 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);
+    switch (event->type()) {
+    case QEvent::KeyPress:
         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) {
+            switch (static_cast<const QKeyEvent *>(event)->key()) {
+            case Qt::Key_Up:
+            case Qt::Key_Down:
+            case Qt::Key_PageUp:
+            case Qt::Key_PageDown:
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
                 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);
+            case Qt::Key_Escape:
+                close();
                 return true;
+            default:
+                break;
             }
         }
-
-        if (keyEvent->key() == Qt::Key_Escape) {
-            hide();
-            deleteLater();
+        break;
+    case QEvent::FocusOut:
+        if (obj == m_inputLine && !m_inputLine->hasFocus()) {
+            close();
             return true;
         }
+        break;
+    case QEvent::MouseButtonPress:
+        if (obj == parentWidget() && isVisible() && !rect().contains(mapFromParent(static_cast<const QMouseEvent *>(event)->pos()))) {
+            close();
+        }
+        break;
+    case QEvent::Resize:
+        if (obj == parentWidget() && isVisible()) {
+            adjustSizeAndPosition();
+        }
+        break;
+    default:
+        break;
     }
 
-    if (event->type() == QEvent::FocusOut && !(m_inputLine->hasFocus() || m_listView->hasFocus())) {
-        hide();
-        deleteLater();
-        return true;
-    }
+    return QWidget::eventFilter(obj, event);
+}
 
-    // handle resizing
-    if (m_mainWindow == obj && event->type() == QEvent::Resize) {
-        updateViewGeometry();
-    }
+void KateQuickOpen::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
 
-    return QWidget::eventFilter(obj, event);
+    QStyleOptionMenuItem option;
+    option.initFrom(this);
+
+    QPainter painter(this);
+
+    style()->drawPrimitive(QStyle::PE_PanelMenu, &option, &painter);
+}
+
+void KateQuickOpen::showEvent(QShowEvent *event)
+{
+    adjustSizeAndPosition();
+
+    QWidget::showEvent(event);
+
+    setFocus(Qt::PopupFocusReason);
 }
 
 void KateQuickOpen::reselectFirst()
@@ -405,14 +425,10 @@ void KateQuickOpen::reselectFirst()
     m_listView->setCurrentIndex(index);
 }
 
-void KateQuickOpen::updateState()
+void KateQuickOpen::refreshModel()
 {
     m_model->refresh(m_mainWindow);
     reselectFirst();
-
-    updateViewGeometry();
-    show();
-    setFocus();
 }
 
 void KateQuickOpen::slotReturnPressed()
@@ -425,15 +441,23 @@ void KateQuickOpen::slotReturnPressed()
 
     // either get view via document pointer or url
     const QModelIndex index = m_listView->currentIndex();
-    KTextEditor::View *view = nullptr;
+    if (!index.isValid()) {
+        return;
+    }
+
+    KTextEditor::View *view;
     if (auto doc = index.data(KateQuickOpenModel::Document).value<KTextEditor::Document *>()) {
         view = m_mainWindow->activateView(doc);
     } else {
         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;
@@ -458,22 +482,19 @@ 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)
 {
     m_model->setListMode(mode);
     // this changes things again, needs refresh, let's go all the way
-    updateState();
+    refreshModel();
 }
 
 void KateQuickOpen::setFilterMode()
@@ -487,7 +508,7 @@ void KateQuickOpen::setFilterMode()
     m_listView->viewport()->update();
 }
 
-static QRect getQuickOpenBoundingRect(QMainWindow *mainWindow)
+static QRect getQuickOpenBoundingRect(KateMainWindow *mainWindow)
 {
     QRect boundingRect = mainWindow->contentsRect();
 
@@ -498,6 +519,13 @@ static QRect getQuickOpenBoundingRect(QMainWindow *mainWindow)
         }
     }
 
+    // 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) {
@@ -505,15 +533,28 @@ static QRect getQuickOpenBoundingRect(QMainWindow *mainWindow)
             continue;
         }
 
-        if (mainWindow->toolBarArea(toolBar) == Qt::TopToolBarArea) {
+        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()
+void KateQuickOpen::adjustSizeAndPosition()
 {
     const QRect boundingRect = getQuickOpenBoundingRect(m_mainWindow);
 
@@ -525,16 +566,13 @@ void KateQuickOpen::updateViewGeometry()
     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))};
+    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);
+    resize(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);
+    move(boundingRect.center().x() - size.width() / 2, boundingRect.y() + 6);
 }
 
 #include "moc_katequickopen.cpp"
diff --git a/apps/lib/quickopen/katequickopen.h b/apps/lib/quickopen/katequickopen.h
index afaa20ad3ce2e872feea2da7793cc60d31115c5c..1c9ecf908eea58a097385306301084bfe51dc209 100644
--- a/apps/lib/quickopen/katequickopen.h
+++ b/apps/lib/quickopen/katequickopen.h
@@ -21,21 +21,22 @@ enum KateQuickOpenModelList : int;
 
 class QuickOpenFilterProxyModel;
 
-class KateQuickOpen : public QFrame
+class KateQuickOpen : public QWidget
 {
     Q_OBJECT
 public:
     KateQuickOpen(KateMainWindow *mainWindow);
 
     /**
-     * update state
+     * refresh model
      * will fill model with current open documents, project documents, ...
      */
-    void updateState();
-    void updateViewGeometry();
+    void refreshModel();
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
+    void paintEvent(QPaintEvent *event) override;
+    void showEvent(QShowEvent *event) override;
 
 private Q_SLOTS:
     void reselectFirst();
@@ -51,6 +52,8 @@ private Q_SLOTS:
     void setFilterMode();
 
 private:
+    void adjustSizeAndPosition();
+
     KateMainWindow *m_mainWindow;
     QTreeView *m_listView;
     QuickOpenLineEdit *m_inputLine;

Places

File 2004-better-quick-open-window.patch of Package kate (Revision 0cd17e9f09c167fb0bc55c2d1c494382)

Places