chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moving the presenterView into an item so we can use a gridView

Browse source
This commit is contained in:
Chris Cochrun 2023-01-27 09:57:05 -06:00
parent 5fb8e867ce
commit 09f5e23612
1 changed files with 127 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/qml/presenter/Presentation.qml
View file

@ -29,7 +29,7 @@ FocusScope {
ColumnLayout { ColumnLayout {
id: mainGrid id: mainGrid
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: Kirigami.Units.largeSpacing * 21 /* anchors.bottomMargin: Kirigami.Units.largeSpacing * 2 */
/* columns: 3 */ /* columns: 3 */
/* rowSpacing: 5 */ /* rowSpacing: 5 */
/* columnSpacing: 0 */ /* columnSpacing: 0 */
@ -81,10 +81,14 @@ FocusScope {
} }
Item { Item {
id: presenterView
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
/* Layout.columnSpan: 3 */
Layout.alignment: Qt.AlignTop Item {
id: slideArea
anchors.fill: parent
anchors.bottomMargin: previewSlidesList.height
Kirigami.Icon { Kirigami.Icon {
source: "arrow-left" source: "arrow-left"
@ -92,7 +96,6 @@ FocusScope {
implicitHeight: Kirigami.Units.gridUnit * 10 implicitHeight: Kirigami.Units.gridUnit * 10
anchors.right: previewSlide.left anchors.right: previewSlide.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
/* Layout.alignment: Qt.AlignRight */
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onPressed: previousSlideAction() onPressed: previousSlideAction()
@ -102,9 +105,8 @@ FocusScope {
Presenter.Slide { Presenter.Slide {
id: previewSlide id: previewSlide
implicitWidth: root.width - 400 implicitWidth: root.width - 400 > 200 ? root.width - 400 : 200
implicitHeight: width / 16 * 9 implicitHeight: width / 16 * 9
/* minimumWidth: 200 */
anchors.centerIn: parent anchors.centerIn: parent
textSize: SlideObject.fontSize textSize: SlideObject.fontSize
itemType: SlideObject.type itemType: SlideObject.type
@ -123,7 +125,6 @@ FocusScope {
implicitHeight: Kirigami.Units.gridUnit * 10 implicitHeight: Kirigami.Units.gridUnit * 10
anchors.left: previewSlide.right anchors.left: previewSlide.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
/* Layout.alignment: Qt.AlignLeft */
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onPressed: nextSlideAction() onPressed: nextSlideAction()
@ -168,20 +169,6 @@ FocusScope {
Keys.onDownPressed: nextSlideAction() Keys.onDownPressed: nextSlideAction()
} }
} }
}
/* Item { */
/* Layout.fillHeight: true */
/* Layout.fillWidth: true */
/* Layout.columnSpan: 3 */
/* } */
Item {
Layout.preferredHeight: 60
Layout.fillWidth: true
/* Layout.columnSpan: 3 */
Layout.alignment: Qt.AlignTop
}
} }
@ -189,7 +176,7 @@ FocusScope {
// The active items X value from root // The active items X value from root
property int activeX property int activeX
id: previewSlidesList id: previewSlidesList
anchors.top: mainGrid.bottom anchors.bottom: presenterView.bottom
width: parent.width width: parent.width
height: Kirigami.Units.gridUnit * 9 height: Kirigami.Units.gridUnit * 9
orientation: ListView.Horizontal orientation: ListView.Horizontal
@ -227,6 +214,16 @@ FocusScope {
duration: 150 duration: 150
}} }}
} }
}
Item {
id: gridView
Layout.fillHeight: true
Layout.fillWidth: true
Layout.alignment: Qt.AlignTop
visible: false
}
}
Item { Item {
id: keyHandler id: keyHandler