[*] improve ui

heng30 · Apr 10, 2024 · 84436e3 · 84436e3
1 parent 8fea6cf
commit 84436e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/ui/base/radio-btn.slint b/ui/base/radio-btn.slint
@@ -1,5 +1,6 @@
 import { Theme } from "../theme.slint";
 import { Label } from "./label.slint";
+import { Palette } from "std-widgets.slint";
 
 export component RadioBtn inherits Rectangle {
     in-out property text <=> txt.text;
@@ -11,23 +12,31 @@ export component RadioBtn inherits Rectangle {
 
     callback check();
 
+    Rectangle {
+        x: hbox.x - (self.width - inner.width) / 2;
+        width: inner.width + Theme.spacing * 4;
+        height: self.width;
+        border-radius: self.width / 2;
+        background: ta.has-hover ? Palette.background : Colors.transparent;
+    }
+
     hbox := HorizontalLayout {
         spacing: Theme.spacing * 4;
         alignment: start;
 
         VerticalLayout {
             alignment: center;
-            Rectangle {
+            inner := Rectangle {
                 width: Theme.default-font-size * 1.1;
                 height: self.width;
                 border-width: 2px;
                 border-radius: self.width / 2;
-                border-color: root.checked ? Theme.brand-color : Theme.secondary-text-color;
+                border-color: root.checked ? Palette.accent-background : Theme.secondary-text-color;
 
                 if root.checked : Rectangle {
                     width: 60%;
                     height: self.width;
-                    background: Theme.brand-color;
+                    background: parent.border-color;
                     border-radius: self.width / 2;
                 }
             }

diff --git a/ui/base/txtedit.slint b/ui/base/txtedit.slint
@@ -1,12 +1,12 @@
-import { TextEdit } from "std-widgets.slint";
+import { TextEdit, Palette } from "std-widgets.slint";
 import { Theme } from "../theme.slint";
 
 export component TxtEdit inherits Rectangle {
     clip: true;
     forward-focus: edit;
-    border-width: 1px;
+    border-width: edit.has-focus ? 2px : 1px;
     border-radius: Theme.border-radius;
-    border-color: edit.has-focus ? Theme.brand-color : Theme.placeholder-text-color;
+    border-color: edit.has-focus ? Palette.accent-background : Palette.border;
 
     in-out property text <=> edit.text;
     callback edited <=> edit.edited;
@@ -22,15 +22,5 @@ export component TxtEdit inherits Rectangle {
         edit := TextEdit {
             font-size: Theme.default-font-size;
         }
-
-        // Flickable {
-        //     viewport-height: edit.preferred-height;
-
-            // edit := TextInput {
-                // font-size: Theme.default-font-size;
-                // single-line: false;
-                // wrap: word-wrap;
-            // }
-        // }
     }
 }