From a1761b3ddbf0b3454d3add8c289c2a627a5bbf37 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Sat, 16 Oct 2021 19:53:52 +0800
Subject: [PATCH] Add new style

---
 qml/main.qml              | 15 +++++---
 src/com.cutefish.Dock.xml |  4 +++
 src/docksettings.cpp      | 17 +++++++++
 src/docksettings.h        | 12 +++++++
 src/mainwindow.cpp        | 72 ++++++++++++++++++++++++++++++---------
 src/mainwindow.h          |  5 +++
 src/xwindowinterface.cpp  |  3 +-
 7 files changed, 107 insertions(+), 21 deletions(-)

diff --git a/qml/main.qml b/qml/main.qml
index 22e6bd5..88164c5 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -37,6 +37,10 @@ Item {
         mainWindow.updateSize()
     }
 
+    Component.onCompleted: {
+        console.log(Settings.style)
+    }
+
     DropArea {
         anchors.fill: parent
         enabled: true
@@ -46,9 +50,9 @@ Item {
     Rectangle {
         id: _background
         anchors.fill: parent
-        radius: root.compositing ? windowRadius : 0
+        radius: root.compositing && Settings.style === 0 ? windowRadius : 0
         color: FishUI.Theme.darkMode ? "#666666" : "#E6E6E6"
-        opacity: root.compositing ? FishUI.Theme.darkMode ? 0.5 : 0.4 : 0.9
+        opacity: root.compositing ? FishUI.Theme.darkMode ? 0.5 : 0.5 : 0.9
         border.width: 0
 
         Behavior on color {
@@ -67,13 +71,13 @@ Item {
         view: mainWindow
         geometry: Qt.rect(root.x, root.y, root.width, root.height)
         strength: 1
-        radius: root.windowRadius
+        radius: _background.radius
     }
 
     FishUI.WindowBlur {
         view: mainWindow
         geometry: Qt.rect(root.x, root.y, root.width, root.height)
-        windowRadius: root.windowRadius
+        windowRadius: _background.radius
         enabled: true
     }
 
@@ -86,6 +90,9 @@ Item {
     GridLayout {
         id: mainLayout
         anchors.fill: parent
+        anchors.topMargin: Settings.style === 1
+                           && (Settings.direction === 0 || Settings.direction === 2)
+                           ? 28 : 0
         flow: isHorizontal ? Grid.LeftToRight : Grid.TopToBottom
         columnSpacing: 0
         rowSpacing: 0
diff --git a/src/com.cutefish.Dock.xml b/src/com.cutefish.Dock.xml
index 52bbdd9..586f12f 100644
--- a/src/com.cutefish.Dock.xml
+++ b/src/com.cutefish.Dock.xml
@@ -11,6 +11,7 @@
     <method name="setDirection"><arg name="direction" type="i" direction="in"/></method>
     <method name="setIconSize"><arg name="iconSize" type="i" direction="in"/></method>
     <method name="setVisibility"><arg name="visibility" type="i" direction="in"/></method>
+    <method name="setStyle"><arg name="style" type="i" direction="in"/></method>
 
     <property name="primaryGeometry" type="(iiii)" access="read">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="QRect"/>
@@ -18,9 +19,12 @@
 
     <property name="direction" type="i" access="read"></property>
     <property name="visibility" type="i" access="read"></property>
+    <property name="style" type="i" access="read"></property>
 
     <signal name="primaryGeometryChanged"></signal>
     <signal name="directionChanged"></signal>
     <signal name="visibilityChanged"></signal>
+    <signal name="styleChanged"></signal>
+
   </interface>
 </node>
diff --git a/src/docksettings.cpp b/src/docksettings.cpp
index 48239f3..b051bf9 100644
--- a/src/docksettings.cpp
+++ b/src/docksettings.cpp
@@ -53,6 +53,8 @@ DockSettings::DockSettings(QObject *parent)
         m_settings->setValue("Visibility", AlwaysShow);
     if (!m_settings->contains("RoundedWindow"))
         m_settings->setValue("RoundedWindow", true);
+    if (!m_settings->contains("Style"))
+        m_settings->setValue("Style", Straight);
 
     m_settings->sync();
 
@@ -60,6 +62,7 @@ DockSettings::DockSettings(QObject *parent)
     m_direction = static_cast<Direction>(m_settings->value("Direction").toInt());
     m_visibility = static_cast<Visibility>(m_settings->value("Visibility").toInt());
     m_roundedWindowEnabled = m_settings->value("RoundedWindow").toBool();
+    m_style = static_cast<Style>(m_settings->value("Style").toInt());
 }
 
 int DockSettings::iconSize() const
@@ -126,3 +129,17 @@ void DockSettings::setRoundedWindowEnabled(bool enabled)
         emit roundedWindowEnabledChanged();
     }
 }
+
+DockSettings::Style DockSettings::style() const
+{
+    return m_style;
+}
+
+void DockSettings::setStyle(const DockSettings::Style &style)
+{
+    if (m_style != style) {
+        m_style = style;
+        m_settings->setValue("Style", style);
+        emit styleChanged();
+    }
+}
diff --git a/src/docksettings.h b/src/docksettings.h
index a671d8b..0a09610 100644
--- a/src/docksettings.h
+++ b/src/docksettings.h
@@ -30,6 +30,7 @@ class DockSettings : public QObject
     Q_PROPERTY(int iconSize READ iconSize WRITE setIconSize NOTIFY iconSizeChanged)
     Q_PROPERTY(int edgeMargins READ edgeMargins WRITE setEdgeMargins)
     Q_PROPERTY(bool roundedWindowEnabled READ roundedWindowEnabled WRITE setRoundedWindowEnabled NOTIFY roundedWindowEnabledChanged)
+    Q_PROPERTY(Style style READ style WRITE setStyle NOTIFY styleChanged)
 
 public:
     enum Direction {
@@ -47,6 +48,12 @@ public:
     };
     Q_ENUMS(Visibility)
 
+    enum Style {
+        Round = 0,
+        Straight
+    };
+    Q_ENUMS(Style)
+
     static DockSettings *self();
     explicit DockSettings(QObject *parent = nullptr);
 
@@ -65,11 +72,15 @@ public:
     bool roundedWindowEnabled() const;
     void setRoundedWindowEnabled(bool enabled);
 
+    Style style() const;
+    void setStyle(const Style &style);
+
 signals:
     void iconSizeChanged();
     void directionChanged();
     void visibilityChanged();
     void roundedWindowEnabledChanged();
+    void styleChanged();
 
 private:
     int m_iconSize;
@@ -77,6 +88,7 @@ private:
     bool m_roundedWindowEnabled;
     Direction m_direction;
     Visibility m_visibility;
+    Style m_style;
     QSettings *m_settings;
 };
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1f210a5..fe14b89 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -92,6 +92,7 @@ MainWindow::MainWindow(QQuickView *parent)
     connect(m_settings, &DockSettings::directionChanged, this, &MainWindow::onPositionChanged);
     connect(m_settings, &DockSettings::iconSizeChanged, this, &MainWindow::onIconSizeChanged);
     connect(m_settings, &DockSettings::visibilityChanged, this, &MainWindow::onVisibilityChanged);
+    connect(m_settings, &DockSettings::styleChanged, this, &MainWindow::resizeWindow);
 }
 
 MainWindow::~MainWindow()
@@ -143,6 +144,16 @@ void MainWindow::setVisibility(int visibility)
     DockSettings::self()->setVisibility(static_cast<DockSettings::Visibility>(visibility));
 }
 
+int MainWindow::style() const
+{
+    return DockSettings::self()->style();
+}
+
+void MainWindow::setStyle(int style)
+{
+    DockSettings::self()->setStyle(static_cast<DockSettings::Style>(style));
+}
+
 void MainWindow::updateSize()
 {
     resizeWindow();
@@ -171,31 +182,60 @@ QRect MainWindow::windowRect() const
     int iconSize = m_settings->iconSize();
     iconSize += iconSize * 0.1;
     int length = appCount * iconSize;
+    int margins = compositing ? DockSettings::self()->edgeMargins() / 2 : 0;
 
     if (length >= maxLength) {
         iconSize = (maxLength - (maxLength % appCount)) / appCount;
         length = appCount * iconSize;
     }
 
-    int margins = compositing ? DockSettings::self()->edgeMargins() / 2 : 0;
+    switch (m_settings->style()) {
+    case DockSettings::Round: {
+        switch (m_settings->direction()) {
+        case DockSettings::Left:
+            newSize = QSize(iconSize, length);
+            position.setX(screenGeometry.x() + margins);
+            // Handle the top statusbar.
+            position.setY(availableGeometry.y() + (availableGeometry.height() - newSize.height()) / 2);
+            break;
+        case DockSettings::Bottom:
+            newSize = QSize(length, iconSize);
+            position.setX(screenGeometry.x() + (screenGeometry.width() - newSize.width()) / 2);
+            position.setY(screenGeometry.y() + screenGeometry.height() - newSize.height() - margins);
+            break;
+        case DockSettings::Right:
+            newSize = QSize(iconSize, length);
+            position.setX(screenGeometry.x() + screenGeometry.width() - newSize.width() - margins);
+            position.setY(availableGeometry.y() + (availableGeometry.height() - newSize.height()) / 2);
+            break;
+        default:
+            break;
+        }
 
-    switch (m_settings->direction()) {
-    case DockSettings::Left:
-        newSize = QSize(iconSize, length);
-        position.setX(screenGeometry.x() + margins);
-        // Handle the top statusbar.
-        position.setY(availableGeometry.y() + (availableGeometry.height() - newSize.height()) / 2);
         break;
-    case DockSettings::Bottom:
-        newSize = QSize(length, iconSize);
-        position.setX(screenGeometry.x() + (screenGeometry.width() - newSize.width()) / 2);
-        position.setY(screenGeometry.y() + screenGeometry.height() - newSize.height() - margins);
-        break;
-    case DockSettings::Right:
-        newSize = QSize(iconSize, length);
-        position.setX(screenGeometry.x() + screenGeometry.width() - newSize.width() - margins);
-        position.setY(availableGeometry.y() + (availableGeometry.height() - newSize.height()) / 2);
+    }
+    case DockSettings::Straight: {
+        switch (m_settings->direction()) {
+        case DockSettings::Left:
+            newSize = QSize(iconSize, screenGeometry.height());
+            position.setX(screenGeometry.x());
+            position.setY(screenGeometry.y());
+            break;
+        case DockSettings::Bottom:
+            newSize = QSize(screenGeometry.width(), iconSize);
+            position.setX(screenGeometry.x());
+            position.setY(screenGeometry.y() + screenGeometry.height() - newSize.height());
+            break;
+        case DockSettings::Right:
+            newSize = QSize(iconSize, screenGeometry.height());
+            position.setX(screenGeometry.x() + screenGeometry.width() - newSize.width());
+            position.setY(screenGeometry.y() + screenGeometry.height() - newSize.height());
+            break;
+        default:
+            break;
+        }
         break;
+    }
     default:
         break;
     }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9e6dbb5..b9d0083 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -35,6 +35,7 @@ class MainWindow : public QQuickView
     Q_PROPERTY(QRect primaryGeometry READ primaryGeometry NOTIFY primaryGeometryChanged)
     Q_PROPERTY(int direction READ direction NOTIFY directionChanged)
     Q_PROPERTY(int visibility READ visibility NOTIFY visibilityChanged)
+    Q_PROPERTY(int style READ style NOTIFY styleChanged)
 
 public:
     explicit MainWindow(QQuickView *parent = nullptr);
@@ -54,6 +55,9 @@ public:
     void setIconSize(int iconSize);
     void setVisibility(int visibility);
 
+    int style() const;
+    void setStyle(int style);
+
     Q_INVOKABLE void updateSize();
 
 signals:
@@ -62,6 +66,7 @@ signals:
     void directionChanged();
     void primaryGeometryChanged();
     void visibilityChanged();
+    void styleChanged();
 
 private:
     QRect windowRect() const;
diff --git a/src/xwindowinterface.cpp b/src/xwindowinterface.cpp
index 1c673fc..c2e5773 100644
--- a/src/xwindowinterface.cpp
+++ b/src/xwindowinterface.cpp
@@ -151,7 +151,8 @@ void XWindowInterface::setViewStruts(QWindow *view, DockSettings::Direction dire
 
     // const QRect currentScreen {screen->geometry()};
     const QRect wholeScreen { {0, 0}, screen->virtualSize() };
-    const int edgeMargins = compositing ? DockSettings::self()->edgeMargins() : 0;
+    bool isRound = DockSettings::self()->style() == DockSettings::Round;
+    const int edgeMargins = compositing && isRound? DockSettings::self()->edgeMargins() : 0;
 
     switch (direction) {
     case DockSettings::Left: {