fix: adjust ui

set windowRadius to 12. sidebar's topMargin is equal width leftMargin. text's color doesn't change with highlight when pressed. Issue: linuxdeepin/developer-center#8409
linuxdeepin · May 7, 2024 · 778af88 · 778af88
1 parent 197fc69
commit 778af88
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 1 deletion.
diff --git a/qml/IconItemDelegate.qml b/qml/IconItemDelegate.qml
@@ -48,6 +48,7 @@ Control {
 
     contentItem: ToolButton {
         focusPolicy: Qt.NoFocus
+        palette.windowText: undefined
         contentItem: Column {
             anchors.fill: parent
 

diff --git a/qml/Main.qml b/qml/Main.qml
@@ -197,6 +197,7 @@ QtObject {
         color: "transparent"
 
         DWindow.enabled: !DebugHelper.useRegularWindow
+        DWindow.windowRadius: 12
         DWindow.enableSystemResize: false
         DWindow.enableSystemMove: false
         DWindow.enableBlurWindow: true

diff --git a/qml/windowed/IconItemDelegate.qml b/qml/windowed/IconItemDelegate.qml
@@ -26,6 +26,7 @@ Control {
     contentItem: ToolButton {
         id: iconButton
         focusPolicy: Qt.NoFocus
+        palette.windowText: undefined
         contentItem: Column {
             anchors.fill: parent
 

diff --git a/qml/windowed/SideBar.qml b/qml/windowed/SideBar.qml
@@ -80,7 +80,6 @@ ColumnLayout {
         id: title
 
         Layout.alignment: Qt.AlignCenter
-        Layout.topMargin: 10
         KeyNavigation.down: computer
         KeyNavigation.up: setting
         KeyNavigation.tab: nextKeyTabTarget

diff --git a/qml/windowed/WindowedFrame.qml b/qml/windowed/WindowedFrame.qml
@@ -66,6 +66,7 @@ Item {
         id: sideBar
         anchors.left: parent.left
         anchors.top: parent.top
+        anchors.topMargin: anchors.leftMargin
         anchors.bottom: parent.bottom
         anchors.leftMargin: 5
         nextKeyTabTarget: bottomBar.keyTabTarget