Resolve conflicting merge issues

2025-07-01 05:20:41 +03:00
parent a18791ef16
commit c17db4bfb1
4 changed files with 38 additions and 201 deletions
@@ -307,18 +307,19 @@ Scope {
                    }

                    VerticalBarSeparator {
-                        visible: ConfigOptions?.bar.borderless
+                        visible: Config.options.bar.borderless
                    }
                }

                // Weather
                Loader {
                    id: weatherLoader
-                    active: ConfigOptions.bar.weather.show
+                    active: Config.options.bar.weather.show
                    anchors.left: middleSection.right
                    anchors.margins: 10
                    sourceComponent: BarGroup {
-                        implicitHeight: barHeight
+                        implicitHeight: Appearance.sizes.baseBarHeight
+                        height: Appearance.sizes.barHeight
                        WeatherBar {}
                    }
                }