Commit 600778c8 authored by Claudio Cambra's avatar Claudio Cambra
Browse files

Fix issues with incidence info drawer sizing



Signed-off-by: Claudio Cambra's avatarClaudio Cambra <claudio.cambra@gmail.com>
parent 4feff4a7
Pipeline #220469 passed with stage
in 2 minutes and 26 seconds
......@@ -155,7 +155,7 @@ Item {
QQC2.Label {
Layout.fillWidth: true
text: modelData.text
elide: parent.spaceRestricted ? Text.ElideNone : Text.ElideRight // Eliding takes up space
//elide: parent.spaceRestricted ? Text.ElideNone : Text.ElideRight // Eliding takes up space
font.weight: Font.Medium
font.pointSize: parent.spaceRestricted ? Kirigami.Theme.smallFont.pointSize :
Kirigami.Theme.defaultFont.pointSize
......
......@@ -65,12 +65,11 @@ Kirigami.OverlayDrawer {
edge: Kirigami.Settings.isMobile ? Qt.BottomEdge :
Qt.application.layoutDirection == Qt.RightToLeft ? Qt.LeftEdge : Qt.RightEdge
height: applicationWindow().height * 0.6
topPadding: 0
leftPadding: 0
rightPadding: 0
bottomPadding: 0
Kirigami.Theme.colorSet: Kirigami.Theme.Window
contentItem: Loader {
......@@ -140,7 +139,8 @@ Kirigami.OverlayDrawer {
id: contentsView
Layout.fillWidth: true
Layout.fillHeight: true
contentWidth: this.availableWidth
contentWidth: availableWidth
contentHeight: infoBody.implicitHeight + (infoBody.padding * 2)
clip: true
property real yScrollPos: QQC2.ScrollBar.vertical.position
......@@ -149,8 +149,12 @@ Kirigami.OverlayDrawer {
GridLayout {
id: infoBody
anchors.fill: parent
anchors.margins: Kirigami.Units.largeSpacing
property int padding: Kirigami.Units.largeSpacing
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: padding
columns: 2
RowLayout {
......
......@@ -543,8 +543,10 @@ Kirigami.ApplicationWindow {
contextDrawer: IncidenceInfoDrawer {
id: incidenceInfoDrawer
bottomPadding: menuLoader.active ? menuLoader.height : 0
width: actualWidth
width: if(!Kirigami.Settings.isMobile) actualWidth
height: if(Kirigami.Settings.isMobile) applicationWindow().height * 0.6
bottomPadding: menuLoader.active ? menuLoader.height : 0
modal: !root.wideScreen || !enabled
onEnabledChanged: drawerOpen = enabled && !modal
onModalChanged: drawerOpen = !modal
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment