Support setting to enable rounded corners

5 years ago · e5b79022f6
parent 8174817502
commit e5b79022f6
7 changed files with 82 additions and 16 deletions
--- a/src/appearance.cpp
+++ b/src/appearance.cpp
@ -39,6 +39,7 @@ Appearance::Appearance(QObject *parent)
 {
    m_dockIconSize = m_dockSettings->value("IconSize").toInt();
    m_dockDirection = m_dockSettings->value("Direction").toInt();
+    m_dockRoundedWindow = m_dockSettings->value("RoundedWindow").toBool();

    m_dockConfigWacher->addPath(m_dockSettings->fileName());
    connect(m_dockConfigWacher, &QFileSystemWatcher::fileChanged, this, [=] {
@ -46,8 +47,11 @@ Appearance::Appearance(QObject *parent)
        m_dockIconSize = m_dockSettings->value("IconSize").toInt();
        m_dockDirection = m_dockSettings->value("Direction").toInt();
        m_dockConfigWacher->addPath(m_dockSettings->fileName());
+        m_dockRoundedWindow = m_dockSettings->value("RoundedWindow").toBool();
+
        emit dockIconSizeChanged();
        emit dockDirectionChanged();
+        emit dockRoundedWindowChanged();
    });

    // Init
@ -103,6 +107,20 @@ void Appearance::setDockDirection(int dockDirection)
    m_dockSettings->setValue("Direction", m_dockDirection);
 }

+int Appearance::dockRoundedWindow() const
+{
+    return m_dockRoundedWindow;
+}
+
+void Appearance::setDockRoundedWindow(bool enable)
+{
+    if (m_dockRoundedWindow == enable)
+        return;
+
+    m_dockRoundedWindow = enable;
+    m_dockSettings->setValue("RoundedWindow", m_dockRoundedWindow);
+}
+
 void Appearance::setGenericFontFamily(const QString &name)
 {
    if (name.isEmpty())
--- a/src/appearance.h
+++ b/src/appearance.h
@ -33,6 +33,7 @@ class Appearance : public QObject
    Q_PROPERTY(int fontPointSize READ fontPointSize WRITE setFontPointSize NOTIFY fontPointSizeChanged)
    Q_PROPERTY(bool dimsWallpaper READ dimsWallpaper WRITE setDimsWallpaper NOTIFY dimsWallpaperChanged)
    Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged)
+    Q_PROPERTY(bool dockRoundedWindow READ dockRoundedWindow WRITE setDockRoundedWindow NOTIFY dockRoundedWindowChanged)

 public:
    explicit Appearance(QObject *parent = nullptr);
@ -48,6 +49,9 @@ public:
    int dockDirection() const;
    Q_INVOKABLE void setDockDirection(int dockDirection);

+    int dockRoundedWindow() const;
+    Q_INVOKABLE void setDockRoundedWindow(bool enable);
+
    Q_INVOKABLE void setGenericFontFamily(const QString &name);
    Q_INVOKABLE void setFixedFontFamily(const QString &name);

@ -65,11 +69,13 @@ signals:
    void fontPointSizeChanged();
    void dimsWallpaperChanged();
    void devicePixelRatioChanged();
+    void dockRoundedWindowChanged();

 private:
    QDBusInterface m_interface;
    QSettings *m_dockSettings;
    QFileSystemWatcher *m_dockConfigWacher;
+    bool m_dockRoundedWindow;

    int m_dockIconSize;
    int m_dockDirection;
--- a/src/qml/DockPage.qml
+++ b/src/qml/DockPage.qml
@ -55,6 +55,7 @@ ItemPage {
            TabBar {
                id: dockSizeTabbar
                Layout.fillWidth: true
+                bottomPadding: Meui.Units.smallSpacing

                TabButton {
                    text: qsTr("Small")
@ -109,6 +110,26 @@ ItemPage {
                }
            }

+            HorizontalDivider {}
+
+            GridLayout {
+                columns: 2
+
+                Label {
+                    text: qsTr("Rounded window")
+                    Layout.fillWidth: true
+                }
+
+                Switch {
+                    Layout.fillHeight: true
+                    checked: appearance.dockRoundedWindow
+
+                    onCheckedChanged: {
+                        appearance.setDockRoundedWindow(checked)
+                    }
+                }
+            }
+
            Item {
                Layout.fillHeight: true
            }
--- a/src/qml/UserPage/UserDelegateItem.qml
+++ b/src/qml/UserPage/UserDelegateItem.qml
@ -94,6 +94,8 @@ Item {

                implicitWidth: height

+                background: Item {}
+
                Image {
                    anchors.centerIn: parent
                    width: 22
--- a/src/qml/Wallpaper/BackgroundPage.qml
+++ b/src/qml/Wallpaper/BackgroundPage.qml
@ -86,6 +86,13 @@ ItemPage {

                width: 200
                height: _view.height
+                scale: 1.0
+
+                Behavior on scale {
+                    NumberAnimation {
+                        duration: 100
+                    }
+                }

                Rectangle {
                    anchors.fill: parent
@ -143,6 +150,8 @@ ItemPage {
                        onExited: function() {
                            image.opacity = 1.0
                        }
+
+                        onPressedChanged: item.scale = pressed ? 0.97 : 1.0
                    }
                }
            }
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@ -326,25 +326,30 @@
        <translation>Size</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="60"/>
+        <location filename="../src/qml/DockPage.qml" line="61"/>
        <source>Small</source>
        <translation>Small</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="64"/>
+        <location filename="../src/qml/DockPage.qml" line="65"/>
        <source>Medium</source>
        <translation>Medium</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="68"/>
+        <location filename="../src/qml/DockPage.qml" line="69"/>
        <source>Large</source>
        <translation>Large</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="72"/>
+        <location filename="../src/qml/DockPage.qml" line="73"/>
        <source>Huge</source>
        <translation>Huge</translation>
    </message>
+    <message>
+        <location filename="../src/qml/DockPage.qml" line="119"/>
+        <source>Rounded window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>LanguagePage</name>
@ -433,22 +438,22 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="122"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="124"/>
        <source>Avatar</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="127"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="129"/>
        <source>Choose</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="133"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="135"/>
        <source>Automatic login</source>
        <translation type="unfinished">Automatic login</translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="153"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="155"/>
        <source>Delete this user</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@ -326,25 +326,30 @@
        <translation>尺寸</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="60"/>
+        <location filename="../src/qml/DockPage.qml" line="61"/>
        <source>Small</source>
        <translation>小</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="64"/>
+        <location filename="../src/qml/DockPage.qml" line="65"/>
        <source>Medium</source>
        <translation>中</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="68"/>
+        <location filename="../src/qml/DockPage.qml" line="69"/>
        <source>Large</source>
        <translation>大</translation>
    </message>
    <message>
-        <location filename="../src/qml/DockPage.qml" line="72"/>
+        <location filename="../src/qml/DockPage.qml" line="73"/>
        <source>Huge</source>
        <translation>巨大</translation>
    </message>
+    <message>
+        <location filename="../src/qml/DockPage.qml" line="119"/>
+        <source>Rounded window</source>
+        <translation>圆角</translation>
+    </message>
 </context>
 <context>
    <name>LanguagePage</name>
@ -433,22 +438,22 @@
        <translation>当前登录</translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="122"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="124"/>
        <source>Avatar</source>
        <translation>头像</translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="127"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="129"/>
        <source>Choose</source>
        <translation>选择</translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="133"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="135"/>
        <source>Automatic login</source>
        <translation>自动登陆</translation>
    </message>
    <message>
-        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="153"/>
+        <location filename="../src/qml/UserPage/UserDelegateItem.qml" line="155"/>
        <source>Delete this user</source>
        <translation>删除该用户</translation>
    </message>