Merge branch 'main' into feat/reposition-bar

Modules/Bar/BarLoader.qml

@@ -2,9 +2,13 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
+import ZShell.Config
 import qs.Components
 import qs.Modules
-import qs.Config
+import qs.Helpers
+import qs.Modules.SysTray
+import qs.Modules.SysTray.Widgets
+import qs.Modules.Network
 
 Item {
 	id: root
@@ -16,7 +20,7 @@ Item {
 	required property bool fullscreen
 	readonly property bool horizontal: position !== "left"
 	property bool isHovered
-	readonly property int padding: Appearance.padding.smaller
+	readonly property int padding: Math.max(Tokens.padding.smaller, Config.bar.border)
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property string position
@@ -51,8 +55,6 @@ Item {
 			to: "visible"
 
 			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
 				property: "extent"
 				target: root
 			}
@@ -62,8 +64,6 @@ Item {
 			to: ""
 
 			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
 				property: "extent"
 				target: root
 			}