From f70979846eb823c6c277c98e7916c27d8be89519 Mon Sep 17 00:00:00 2001 From: Jarrod Doyle Date: Wed, 10 Apr 2024 13:31:28 +0100 Subject: [PATCH] Make boxes rounded by default --- ui/appwindow.slint | 1 + ui/editor_bar.slint | 1 - ui/object_tool_panel.slint | 5 ----- ui/status_bar.slint | 1 - ui/tool_bar.slint | 1 - ui/widgets/layout.slint | 4 ++-- ui/widgets/panel.slint | 2 -- 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ui/appwindow.slint b/ui/appwindow.slint index f062846..92bc08b 100644 --- a/ui/appwindow.slint +++ b/ui/appwindow.slint @@ -11,6 +11,7 @@ export component AppWindow inherits Window { preferred-width: 1280px; preferred-height: 720px; VerticalBox { + j-rounding: 0px; j-padding: Metrics.padding-sm; j-spacing: Metrics.spacing-sm; j-alignment: stretch; diff --git a/ui/editor_bar.slint b/ui/editor_bar.slint index 695f212..84baec3 100644 --- a/ui/editor_bar.slint +++ b/ui/editor_bar.slint @@ -4,7 +4,6 @@ import { HorizontalBox } from "widgets/layout.slint"; export component EditorBar inherits HorizontalBox { height: Metrics.size-xl; j-spacing: Metrics.spacing-xl; - j-rounding: Metrics.radius-md; Text { color: DarkPalette.text[4]; diff --git a/ui/object_tool_panel.slint b/ui/object_tool_panel.slint index 84fa5fc..6bbb913 100644 --- a/ui/object_tool_panel.slint +++ b/ui/object_tool_panel.slint @@ -5,7 +5,6 @@ import { HorizontalBox, VerticalBox } from "widgets/layout.slint"; export component ObjectToolPanel inherits VerticalBox { width: 280px; - j-rounding: Metrics.radius-md; j-alignment: stretch; Text { @@ -103,7 +102,6 @@ export component ObjectToolPanel inherits VerticalBox { HorizontalBox { j-alignment: stretch; - j-rounding: Metrics.radius-md; j-padding: 0px; Text { @@ -117,7 +115,6 @@ export component ObjectToolPanel inherits VerticalBox { HorizontalBox { width: Metrics.size-md; - j-rounding: Metrics.radius-md; j-elevation: 3; Rectangle { } @@ -125,7 +122,6 @@ export component ObjectToolPanel inherits VerticalBox { HorizontalBox { width: Metrics.size-md; - j-rounding: Metrics.radius-md; j-elevation: 3; Rectangle { } @@ -134,7 +130,6 @@ export component ObjectToolPanel inherits VerticalBox { VerticalBox { j-alignment: stretch; - j-rounding: Metrics.radius-md; Text { color: DarkPalette.text[4]; diff --git a/ui/status_bar.slint b/ui/status_bar.slint index a885416..e5f30ac 100644 --- a/ui/status_bar.slint +++ b/ui/status_bar.slint @@ -4,7 +4,6 @@ import { HorizontalBox } from "widgets/layout.slint"; export component StatusBar inherits HorizontalBox { height: Metrics.size-lg; - j-rounding: Metrics.radius-md; j-spacing: Metrics.spacing-lg; Text { diff --git a/ui/tool_bar.slint b/ui/tool_bar.slint index 7eb4b23..00076e2 100644 --- a/ui/tool_bar.slint +++ b/ui/tool_bar.slint @@ -12,7 +12,6 @@ component ToolBarItem inherits Rectangle { export component ToolBar inherits VerticalBox { width: Metrics.size-xl; - j-rounding: Metrics.radius-md; Button { checkable: true; diff --git a/ui/widgets/layout.slint b/ui/widgets/layout.slint index 013e113..c953f05 100644 --- a/ui/widgets/layout.slint +++ b/ui/widgets/layout.slint @@ -9,7 +9,7 @@ struct BorderStyle { export component HorizontalBox inherits Rectangle { // TODO: border, shadow in property j-elevation: 1; - in property j-rounding: 0px; + in property j-rounding: Metrics.radius-md; in property j-padding: Metrics.padding-md; in property j-spacing: Metrics.spacing-md; in property j-alignment: start; @@ -29,7 +29,7 @@ export component HorizontalBox inherits Rectangle { export component VerticalBox inherits Rectangle { // TODO: border, shadow in property j-elevation: 1; - in property j-rounding: 0px; + in property j-rounding: Metrics.radius-md; in property j-padding: Metrics.padding-md; in property j-spacing: Metrics.spacing-md; in property j-alignment: start; diff --git a/ui/widgets/panel.slint b/ui/widgets/panel.slint index 5f03be1..0358e30 100644 --- a/ui/widgets/panel.slint +++ b/ui/widgets/panel.slint @@ -5,8 +5,6 @@ export component Panel inherits VerticalBox { in property title: "Title"; in property title-alignment: left; - j-rounding: Metrics.radius-md; - Text { height: Metrics.size-md; color: DarkPalette.text[4];