diff --git a/src/appearance.cpp b/src/appearance.cpp
index c0eea45..094a211 100644
--- 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())
diff --git a/src/appearance.h b/src/appearance.h
index c495bf2..4d6ef0d 100644
--- 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;
diff --git a/src/qml/DockPage.qml b/src/qml/DockPage.qml
index fd181bd..6bb6c63 100644
--- 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
}
diff --git a/src/qml/UserPage/UserDelegateItem.qml b/src/qml/UserPage/UserDelegateItem.qml
index 3f8eeb6..446a911 100644
--- 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
diff --git a/src/qml/Wallpaper/BackgroundPage.qml b/src/qml/Wallpaper/BackgroundPage.qml
index 2c58687..eff0ef9 100644
--- 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
}
}
}
diff --git a/translations/en_US.ts b/translations/en_US.ts
index 3232c97..dcc6940 100644
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@@ -326,25 +326,30 @@
Size
-
+
Small
Small
-
+
Medium
Medium
-
+
Large
Large
-
+
Huge
Huge
+
+
+ Rounded window
+
+
LanguagePage
@@ -433,22 +438,22 @@
-
+
Avatar
-
+
Choose
-
+
Automatic login
Automatic login
-
+
Delete this user
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index faa8e79..efc4eac 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -326,25 +326,30 @@
尺寸
-
+
Small
小
-
+
Medium
中
-
+
Large
大
-
+
Huge
巨大
+
+
+ Rounded window
+ 圆角
+
LanguagePage
@@ -433,22 +438,22 @@
当前登录
-
+
Avatar
头像
-
+
Choose
选择
-
+
Automatic login
自动登陆
-
+
Delete this user
删除该用户