ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Layout margins consistently

Browse Source 
Fixes #319, #320 - caused by inconsistent usage of layout margins on
This commit is contained in:
Arnav Rawat
2021-03-29 21:45:36 +00:00
committed by Carl Schwan
parent 9f637ab925
commit 997972a3d3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imports/NeoChat/Component/Timeline/TimelineContainer.qml
View File

@@ -149,7 +149,7 @@ Item {
QQC2.ItemDelegate { QQC2.ItemDelegate {
id: controlContainer id: controlContainer
Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2 Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2
implicitHeight: contentItem.implicitHeight implicitHeight: contentItem.implicitHeight + topPadding
topPadding: Kirigami.Units.largeSpacing topPadding: Kirigami.Units.largeSpacing
bottomPadding: 0 bottomPadding: 0
leftPadding: 0 leftPadding: 0

3
imports/NeoChat/Page/RoomPage.qml
View File

@@ -394,7 +394,7 @@ Kirigami.ScrollablePage {
innerObject: TextDelegate { innerObject: TextDelegate {
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: Kirigami.Units.largeSpacing Layout.rightMargin: Kirigami.Units.largeSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.leftMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Kirigami.Units.largeSpacing
TapHandler { TapHandler {
acceptedButtons: Qt.RightButton acceptedButtons: Qt.RightButton
@@ -438,6 +438,7 @@ Kirigami.ScrollablePage {
innerObject: ImageDelegate { innerObject: ImageDelegate {
Layout.minimumWidth: Kirigami.Units.gridUnit * 10 Layout.minimumWidth: Kirigami.Units.gridUnit * 10
Layout.fillWidth: true Layout.fillWidth: true
Layout.bottomMargin: Kirigami.Units.largeSpacing
Layout.preferredHeight: info.h / info.w * width Layout.preferredHeight: info.h / info.w * width
Layout.maximumHeight: Kirigami.Units.gridUnit * 15 Layout.maximumHeight: Kirigami.Units.gridUnit * 15
Layout.maximumWidth: Kirigami.Units.gridUnit * 30 Layout.maximumWidth: Kirigami.Units.gridUnit * 30