diff --git a/modules/detachedcontent/DetachedContent.qml b/modules/detachedcontent/DetachedContent.qml index 42269177..ab4b4ef1 100644 --- a/modules/detachedcontent/DetachedContent.qml +++ b/modules/detachedcontent/DetachedContent.qml @@ -20,17 +20,13 @@ Item { implicitWidth: implicitHeight * Config.dcontent.sizes.ratio implicitHeight: screen.height * Config.dcontent.sizes.heightMult - GridLayout { + RowLayout { anchors.fill: parent - rows: 2 - columns: 2 - rowSpacing: 0 - columnSpacing: 0 + spacing: 0 StyledRect { Layout.fillHeight: true - Layout.rowSpan: 2 topLeftRadius: Appearance.rounding.normal bottomLeftRadius: Appearance.rounding.normal @@ -44,13 +40,6 @@ Item { } } - StyledRect { - Layout.fillWidth: true - implicitHeight: 50 - topRightRadius: Appearance.rounding.normal - color: Colours.palette.m3surfaceContainer - } - Item { Layout.fillWidth: true Layout.fillHeight: true @@ -66,6 +55,7 @@ Item { StyledRect { anchors.fill: parent color: Colours.palette.m3surfaceContainer + topRightRadius: Appearance.rounding.normal bottomRightRadius: Appearance.rounding.normal layer.enabled: true @@ -88,7 +78,6 @@ Item { Rectangle { anchors.fill: parent anchors.margins: Appearance.padding.normal - anchors.topMargin: 0 anchors.leftMargin: 0 radius: Appearance.rounding.small } diff --git a/modules/detachedcontent/NavRail.qml b/modules/detachedcontent/NavRail.qml index fb30c061..afa8c5ab 100644 --- a/modules/detachedcontent/NavRail.qml +++ b/modules/detachedcontent/NavRail.qml @@ -26,7 +26,7 @@ Item { when: root.expanded PropertyChanges { - layout.spacing: Appearance.spacing.small / 2 + layout.spacing: Appearance.spacing.small menuIcon.opacity: 0 menuIconExpanded.opacity: 1 menuIcon.rotation: 180 @@ -50,7 +50,7 @@ Item { Item { Layout.fillWidth: true - Layout.bottomMargin: Appearance.spacing.small / 2 + Layout.bottomMargin: Appearance.spacing.large * 2 implicitHeight: Math.max(menuIcon.implicitHeight, menuIconExpanded.implicitHeight) + Appearance.padding.normal * 2 StateLayer { @@ -82,6 +82,11 @@ Item { } } + NavItem { + icon: "network_manage" + label: "network" + } + NavItem { icon: "settings_bluetooth" label: "bluetooth"