refactor flexible grids into Box

This commit is contained in:
end-4
2026-03-09 11:03:56 +01:00
parent d1dc89b9f2
commit 6952d89a7f
7 changed files with 37 additions and 16 deletions
@@ -0,0 +1,11 @@
pragma ComponentBehavior: Bound
import QtQuick
// A type that's both capable of being rows and columns
// Qt Row is just a locked down Grid smh
// Calling it a Box because that's how row-or-column widget is called in Gtk
Grid {
property bool vertical: false
columns: vertical ? 1 : -1
rows: vertical ? -1 : 1
}
@@ -0,0 +1,13 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
// Box, Layout version
// A type that's both capable of being rows and columns
// Qt Row is just a locked down Grid smh
// Calling it a Box because that's how row-or-column widget is called in Gtk
GridLayout {
property bool vertical: false
columns: vertical ? 1 : -1
rows: vertical ? -1 : 1
}
@@ -2,11 +2,10 @@ pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
GridLayout {
BoxLayout {
id: root
property bool vertical: true
columns: vertical ? 1 : -1
vertical: true
property real totalDuration: 250
property real interval: totalDuration / count
@@ -339,7 +339,7 @@ HBarWidgetContainer {
}
/////////////////// Components ///////////////////
component WorkspaceLayout: Grid {
component WorkspaceLayout: Box {
anchors {
top: !root.vertical ? parent.top : undefined
bottom: !root.vertical ? parent.bottom : undefined
@@ -349,8 +349,7 @@ HBarWidgetContainer {
rowSpacing: 0
columnSpacing: 0
columns: root.vertical ? 1 : -1
rows: root.vertical ? -1 : 1
vertical: root.vertical
}
component WorkspaceItem: Item {
@@ -1,4 +1,5 @@
import qs.modules.common
import qs.modules.common.widgets
import QtQuick
import QtQuick.Layouts
@@ -23,9 +24,9 @@ Item {
radius: Appearance.rounding.small
}
GridLayout {
BoxLayout {
id: gridLayout
columns: root.vertical ? 1 : -1
vertical: root.vertical
anchors {
verticalCenter: root.vertical ? undefined : parent.verticalCenter
horizontalCenter: root.vertical ? parent.horizontalCenter : undefined
@@ -60,9 +60,9 @@ Item {
}
}
GridLayout {
BoxLayout {
id: gridLayout
columns: root.vertical ? 1 : -1
vertical: root.vertical
anchors.fill: parent
rowSpacing: 8
columnSpacing: 15
@@ -82,14 +82,13 @@ Item {
}
// Workspaces - background
Grid {
Box {
z: 1
anchors.centerIn: parent
rowSpacing: 0
columnSpacing: 0
columns: root.vertical ? 1 : -1
rows: root.vertical ? -1 : 1
vertical: root.vertical
Repeater {
model: wsModel.shownCount
@@ -160,13 +159,12 @@ Item {
}
// Workspaces - numbers
Grid {
Box {
id: wsNumbers
z: 3
anchors.fill: parent
columns: root.vertical ? 1 : -1
rows: root.vertical ? -1 : 1
vertical: root.vertical
columnSpacing: 0
rowSpacing: 0