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

Overview Repositories Revisions Requests Users Attributes Meta

File 2004-quick-open-window-shadow.patch of Package kate (Revision 0f7ca7d2fe1557eec165b9c4e21269c1)

Currently displaying revision 0f7ca7d2fe1557eec165b9c4e21269c1 , Show latest

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..627fcf2b3d4c6510960a9a0af68248ad64467184 100644
--- a/apps/lib/quickopen/katequickopen.cpp
+++ b/apps/lib/quickopen/katequickopen.cpp
@@ -29,7 +29,6 @@
 
 #include <drawing_utils.h>
 #include <kfts_fuzzy_match.h>
-#include <qgraphicseffect.h>
 
 class QuickOpenFilterProxyModel final : public QSortFilterProxyModel
 {
@@ -269,19 +268,9 @@ private:
 Q_DECLARE_METATYPE(QPointer<KTextEditor::Document>)
 
 KateQuickOpen::KateQuickOpen(KateMainWindow *mainWindow)
-    : QFrame(mainWindow)
+    : QGroupBox(mainWindow)
     , m_mainWindow(mainWindow)
 {
-    QGraphicsDropShadowEffect *e = new QGraphicsDropShadowEffect(this);
-    e->setColor(palette().color(QPalette::Shadow));
-    e->setOffset(2.);
-    e->setBlurRadius(8.);
-    setGraphicsEffect(e);
-
-    setAutoFillBackground(true);
-    setFrameShadow(QFrame::Raised);
-    setFrameShape(QFrame::Box);
-
     // handle resizing
     mainWindow->installEventFilter(this);
 
@@ -487,7 +476,7 @@ void KateQuickOpen::setFilterMode()
     m_listView->viewport()->update();
 }
 
-static QRect getQuickOpenBoundingRect(QMainWindow *mainWindow)
+static QRect getQuickOpenBoundingRect(KateMainWindow *mainWindow)
 {
     QRect boundingRect = mainWindow->contentsRect();
 
@@ -498,6 +487,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,8 +501,21 @@ 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;
         }
     }
 
diff --git a/apps/lib/quickopen/katequickopen.h b/apps/lib/quickopen/katequickopen.h
index afaa20ad3ce2e872feea2da7793cc60d31115c5c..2f447550b7c99b90ea77110a198a7ae83c996dc0 100644
--- a/apps/lib/quickopen/katequickopen.h
+++ b/apps/lib/quickopen/katequickopen.h
@@ -9,6 +9,8 @@
 
 #include "katequickopenlineedit.h"
 
+#include <QGroupBox>
+
 class KateMainWindow;
 
 class QModelIndex;
@@ -21,7 +23,7 @@ enum KateQuickOpenModelList : int;
 
 class QuickOpenFilterProxyModel;
 
-class KateQuickOpen : public QFrame
+class KateQuickOpen : public QGroupBox
 {
     Q_OBJECT
 public:

Places

File 2004-quick-open-window-shadow.patch of Package kate (Revision 0f7ca7d2fe1557eec165b9c4e21269c1)

Places