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

Minor adjustments to emoji picker

Browse source
This commit is contained in:
Joseph Donofry 2020-06-09 20:47:21 -04:00
parent e20cddd005
commit fa34749279
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ScrollHelper.qml
View file

@ -71,7 +71,7 @@ MouseArea {
pixelDelta = wheel.pixelDelta.y pixelDelta = wheel.pixelDelta.y
} }
pixelDelta = Math.round(pixelDelta) pixelDelta = Math.round(pixelDelta)
if (!pixelDelta) { if (!pixelDelta) {
return flickableItem.contentY; return flickableItem.contentY;

1
resources/qml/TimelineRow.qml
View file

@ -95,7 +95,6 @@ MouseArea {
emojiPicker: emojiPopup emojiPicker: emojiPopup
room_id: model.roomId room_id: model.roomId
event_id: model.id event_id: model.id
// onClicked: chat.model.reactAction(model.id)
} }
ImageButton { ImageButton {
visible: timelineSettings.buttons visible: timelineSettings.buttons

29
resources/qml/emoji/EmojiPicker.qml
View file

@ -65,7 +65,7 @@ Popup {
cellWidth: 52 cellWidth: 52
cellHeight: 52 cellHeight: 52
boundsBehavior: Flickable.DragOverBounds boundsBehavior: Flickable.StopAtBounds
clip: true clip: true
@ -147,9 +147,9 @@ Popup {
onVisibleChanged: if (visible) forceActiveFocus() onVisibleChanged: if (visible) forceActiveFocus()
} }
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {
id: emojiScroll id: emojiScroll
} }
} }
// Separator // Separator
@ -188,12 +188,19 @@ Popup {
horizontalAlignment: Image.AlignHCenter horizontalAlignment: Image.AlignHCenter
verticalAlignment: Image.AlignVCenter verticalAlignment: Image.AlignVCenter
fillMode: Image.Pad fillMode: Image.Pad
smooth: true
sourceSize.width: 32 sourceSize.width: 32
sourceSize.height: 32 sourceSize.height: 32
source: "image://colorimage/" + model.image + "?" + (hovered ? colors.highlight : colors.buttonText) source: "image://colorimage/" + model.image + "?" + (hovered ? colors.highlight : colors.buttonText)
} }
MouseArea
{
id: mouseArea
anchors.fill: parent
onPressed: mouse.accepted = false
cursorShape: Qt.PointingHandCursor
}
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
@ -265,12 +272,20 @@ Popup {
anchors.right: parent.right anchors.right: parent.right
horizontalAlignment: Image.AlignHCenter horizontalAlignment: Image.AlignHCenter
verticalAlignment: Image.AlignVCenter verticalAlignment: Image.AlignVCenter
fillMode: Image.Pad
smooth: true
sourceSize.width: 32 sourceSize.width: 32
sourceSize.height: 32 sourceSize.height: 32
fillMode: Image.Pad
smooth: true
source: "image://colorimage/:/icons/icons/ui/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText) source: "image://colorimage/:/icons/icons/ui/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
} }
MouseArea
{
id: mouseArea
anchors.fill: parent
onPressed: mouse.accepted = false
cursorShape: Qt.PointingHandCursor
}
} }
} }
} }