修复无DXCB且WM不支持拖动情况下窗口的拖拽

gui/spkmainwindow.cpp

@@ -162,6 +162,8 @@ SpkUi::SpkMainWidget::SpkMainWidget(QWidget *parent) : QFrame(parent)
   HorizontalDivide->setSpacing(0);
   HorizontalDivide->setContentsMargins(0, 0, 0, 0);
   HorizontalDivide->setAlignment(Qt::AlignLeft);
+  if(!SpkUi::States::IsUsingDtkPlugin)
+    HorizontalDivide->addSpacing(SpkWindow::BorderWidth);
   HorizontalDivide->addWidget(SideBarRestrictor);
   HorizontalDivide->addLayout(VLayMain);
 

gui/spkui_general.cpp

@@ -28,6 +28,12 @@ namespace SpkUi
   QSize PrimaryScreenSize;
   SpkDtkPlugin *DtkPlugin = nullptr;
   QStyle *OldSystemStyle = nullptr;
+  QList<QColor> CurrentColorSet;
+
+  namespace States
+  {
+    bool IsDDE = false, IsUsingDtkPlugin = false;
+  }
 
   namespace Priv
   {
@@ -51,7 +57,7 @@ namespace SpkUi
     signal(SIGFPE, SpkUi::CrashSignalHandler);
 
     // Prepare theme following for DDE
-    if(CheckIsDeepinDesktop())
+    if((States::IsDDE = CheckIsDeepinDesktop()))
       PrepareForDeepinDesktop();
 
     // Misc data initialization
@@ -83,12 +89,18 @@ namespace SpkUi
     qApp->addLibraryPath("/usr/local/lib");
     qApp->addLibraryPath("/usr/lib");
 #endif
+    if(!qgetenv("SPARK_NO_DTK_PLUGIN").toInt())
+    {
       QPluginLoader p("libspkdtkplugin");
       if(p.load())
       {
         auto i = qobject_cast<SpkDtkPlugin*>(p.instance());
         if(i)
+        {
           DtkPlugin = i;
+          States::IsUsingDtkPlugin = true;
+        }
+      }
     }
 
     // FIXME: Chameleon style kept adding unwanted blue focus indication border
@@ -117,26 +129,28 @@ namespace SpkUi
     switch(aStyle)
     {
       case Light:
-        CurrentStylesheet = StylesheetFromColors(
+        static auto LightColor = QList<QColor>{
-          QList<QColor>{
                                0x353535, 0x353535, 0xff0000, 0x0070ff, 0x2987ff,
                                0x6b6b6b, 0x656565, 0x606060, 0x404040, 0x383838,
                                ColorTextOnBackground(0x0070ff)
-          });
+                             };
+        CurrentStylesheet = StylesheetFromColors(LightColor);
         qApp->setStyleSheet(CurrentStylesheet);
         // TODO
         ColorLine = Qt::black;
         break;
       case Dark:
-        CurrentStylesheet = StylesheetFromColors(
+        static auto DarkColor = QList<QColor>{
-          QList<QColor>{
                          0x353535, 0x353535, 0xff0000, 0x0070ff, 0x2987ff,
                          0x6b6b6b, 0x656565, 0x606060, 0x404040, 0x383838,
                          ColorTextOnBackground(0x0070ff)
-          });
+                       };
+        CurrentStylesheet = StylesheetFromColors(DarkColor);
+        CurrentColorSet = DarkColor;
         qApp->setStyleSheet(CurrentStylesheet);
         ColorLine = Qt::white;
         break;
+        // IDE complains about default label covering all conditions, commented
 //      default:
 //        sWarn(QObject::tr("SetGlobalStyle invoked with unknown style %1.")
 //              .arg(static_cast<int>(aStyle)));

gui/spkwindow.cpp

@@ -21,7 +21,7 @@ SpkWindow::SpkWindow(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(paren
   mCornerRadius = 5;
   mUserCentralWidget = nullptr;
   mResizable = true;
-  mResizing = false;
+  mMoving = mResizing = false;
   mCloseHook = nullptr;
   mMaximized = windowState().testFlag(Qt::WindowMaximized);
   mUseCustomEvents = SpkUi::DtkPlugin == nullptr;
@@ -63,6 +63,17 @@ bool SpkWindow::event(QEvent *evt)
         mEdgesBeingResized = edge;
         return true;
       }
+      else
+      {
+        if(!QMainWindow::event(evt) || 1)
+        {
+          mMoveOffset = e->globalPos() - pos();
+          setCursor(Qt::SizeAllCursor);
+          mMoving = true;
+          mResizing = false;
+        }
+        return true;
+      }
       break;
     }
     case QEvent::MouseButtonRelease:
@@ -71,30 +82,39 @@ bool SpkWindow::event(QEvent *evt)
       auto e = static_cast<QMouseEvent*>(evt);
       if(e->button() != Qt::LeftButton) break;
       mResizing = false;
+      mMoving = false;
+      unsetCursor();
       return true;
       break;
     }
     case QEvent::HoverMove:
     {
-      if(mResizing || !mResizable) break;
+      if((mResizing || !mResizable) && !mMoving) break;
       if(mMaximized)
       {
         unsetCursor();
         break;
       }
+      if(mResizable && !mMoving)
+      {
         auto e = static_cast<QHoverEvent*>(evt);
         auto edge = DetectEdgeOnThis(e->pos());
         SetMouseCursor(edge);
+      }
       break;
     }
     case QEvent::MouseMove:
     {
-      if(!mResizable) break;
+      if(mMaximized) break;
       auto e = static_cast<QMouseEvent*>(evt);
-      if(mResizing && !mMaximized)
+      if(mResizing && mResizable)
       {
         ResizeWindowByCursor(e->globalPos());
-        return true;
+        return true; // Intercept resize movements
+      }
+      else if(mMoving)
+      {
+        move(e->globalPos() - mMoveOffset);
       }
       break;
     }
@@ -221,8 +241,6 @@ void SpkWindow::SetWindowTheme(SpkWindow::SpkWindowStyle style)
     case Dark:
       SpkUi::SetGlobalStyle(SpkUi::SpkUiStyle::Dark);
       break;
-    default:
-      ;
   }
 }
 

inc/spkui_general.h

@@ -25,6 +25,12 @@ namespace SpkUi
   extern QSize PrimaryScreenSize;
   extern SpkDtkPlugin *DtkPlugin;
   extern QStyle *OldSystemStyle;
+  extern QList<QColor> CurrentColorSet;
+
+  namespace States
+  {
+    extern bool IsDDE, IsUsingDtkPlugin;
+  }
 
   namespace Priv
   {

inc/spkwindow.h

@@ -18,6 +18,7 @@ class SpkWindow : public QMainWindow
     Q_OBJECT
   public:
     enum SpkWindowStyle { Dark, Light };
+    static constexpr int BorderWidth = 7;
 
   private:
     QWidget *mCentralWidget, *mUserCentralWidget;
@@ -26,24 +27,23 @@ class SpkWindow : public QMainWindow
     int mCornerRadius;
     bool mMoving, mResizing, mMaximized, mResizable;
     Qt::Edges mEdgesBeingResized;
+    QPoint mMoveOffset;
     bool (*mCloseHook)(void);
     bool mUseCustomEvents;
 
-    static constexpr int BorderWidth = 10;
-
   public:
     SpkWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
     ~SpkWindow() override;
     void SetCentralWidget(QWidget *);
     bool GetUseTitleBar();
-    bool GetResizable() { return mResizable; };
+    bool GetResizable() { return mResizable; }
     void SetCloseHook(bool(*f)(void));
 
   public slots:
     void SetCornerRadius(int);
     void SetWindowTheme(SpkWindowStyle);
     void SetUseTitleBar(bool);
-    void SetResizable(bool a) { mResizable = a; };
+    void SetResizable(bool a) { mResizable = a; }
     void SetCentralMargin(int, int, int, int);
     void ClearCloseHook();
     void RecalculateSize();
@@ -59,6 +59,7 @@ class SpkWindow : public QMainWindow
     void SetMouseCursor(Qt::Edges);
     void ResizeWindowByCursor(QPoint);
     void closeEvent(QCloseEvent *) override;
+//    void paintEvent(QPaintEvent *) override;
 
   private:
     void PopulateUi();