d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address CR comments

Browse source
This commit is contained in:
Lasath Fernando 2020-04-29 02:14:43 -07:00
parent 5c57de070e
commit c5d373e8f1
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/ScrollHelper.qml
View file

@ -22,7 +22,7 @@ import QtQuick.Controls 2.12
/* /*
* Shamelessly stolen from: * Shamelessly stolen from:
* https://gitlab.com/spectral-im/spectral/-/blob/master/imports/Spectral/Component/ScrollHelper.qml * https://cgit.kde.org/kube.git/tree/framework/qml/ScrollHelper.qml
* *
* The MouseArea + interactive: false + maximumFlickVelocity are required * The MouseArea + interactive: false + maximumFlickVelocity are required
* to fix scrolling for desktop systems where we don't want flicking behaviour. * to fix scrolling for desktop systems where we don't want flicking behaviour.
@ -42,13 +42,14 @@ MouseArea {
z: -1 z: -1
onFlickableChanged: { onFlickableChanged: {
if (enabled) { if (enabled) {
flickable.interactive = false
flickable.maximumFlickVelocity = 100000 flickable.maximumFlickVelocity = 100000
flickable.boundsBehavior = Flickable.StopAtBounds flickable.boundsBehavior = Flickable.StopAtBounds
root.parent = flickable root.parent = flickable
} }
} }
acceptedButtons: Qt.NoButton
function calculateNewPosition(flickableItem, wheel) { function calculateNewPosition(flickableItem, wheel) {
//Nothing to scroll //Nothing to scroll
if (flickableItem.contentHeight < flickableItem.height) { if (flickableItem.contentHeight < flickableItem.height) {

13
resources/qml/TimelineView.qml
View file

@ -114,7 +114,6 @@ Page {
model: timelineManager.timeline model: timelineManager.timeline
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
pixelAligned: true
ScrollHelper { ScrollHelper {
flickable: parent flickable: parent
@ -208,10 +207,8 @@ Page {
text: chat.model.formatDateSeparator(modelData.timestamp) text: chat.model.formatDateSeparator(modelData.timestamp)
color: colors.brightText color: colors.brightText
leftPadding: 24 height: fontMetrics.height * 1.4
rightPadding: 24 width: contentWidth * 1.2
topPadding: 8
bottomPadding: 8
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
background: Rectangle { background: Rectangle {
@ -221,7 +218,7 @@ Page {
} }
Row { Row {
height: userName.height height: userName.height
spacing: 4 spacing: 4
Avatar { Avatar {
width: avatarSize width: avatarSize
height: avatarSize height: avatarSize
@ -327,4 +324,8 @@ Page {
} }
} }
} }
FontMetrics {
id: fontMetrics
}
} }

6
resources/qml/delegates/Pill.qml
View file

@ -5,10 +5,8 @@ Label {
color: colors.brightText color: colors.brightText
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
leftPadding: 24 height: fontMetrics.height * 1.4
rightPadding: 24 width: contentWidth * 1.2
topPadding: 8
bottomPadding: 8
background: Rectangle { background: Rectangle {
radius: parent.height / 2 radius: parent.height / 2