Minor adjustments to emoji picker
3 files changed, 23 insertions, 9 deletions
diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml
index cdb4a23a..e666c7cc 100644
--- a/resources/qml/ScrollHelper.qml
+++ b/resources/qml/ScrollHelper.qml
@@ -71,7 +71,7 @@ MouseArea {
pixelDelta = wheel.pixelDelta.y
}
- pixelDelta = Math.round(pixelDelta)
+ pixelDelta = Math.round(pixelDelta)
if (!pixelDelta) {
return flickableItem.contentY;
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 1f2f1615..9961d15f 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -95,7 +95,6 @@ MouseArea {
emojiPicker: emojiPopup
room_id: model.roomId
event_id: model.id
-// onClicked: chat.model.reactAction(model.id)
}
ImageButton {
visible: timelineSettings.buttons
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index c416337d..b4c9640d 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -65,7 +65,7 @@ Popup {
cellWidth: 52
cellHeight: 52
- boundsBehavior: Flickable.DragOverBounds
+ boundsBehavior: Flickable.StopAtBounds
clip: true
@@ -147,9 +147,9 @@ Popup {
onVisibleChanged: if (visible) forceActiveFocus()
}
- ScrollBar.vertical: ScrollBar {
- id: emojiScroll
- }
+ ScrollBar.vertical: ScrollBar {
+ id: emojiScroll
+ }
}
// Separator
@@ -188,12 +188,19 @@ Popup {
horizontalAlignment: Image.AlignHCenter
verticalAlignment: Image.AlignVCenter
fillMode: Image.Pad
- smooth: true
sourceSize.width: 32
sourceSize.height: 32
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 {
anchors.fill: parent
@@ -265,12 +272,20 @@ Popup {
anchors.right: parent.right
horizontalAlignment: Image.AlignHCenter
verticalAlignment: Image.AlignVCenter
- fillMode: Image.Pad
- smooth: true
sourceSize.width: 32
sourceSize.height: 32
+ fillMode: Image.Pad
+ smooth: true
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
+ }
}
}
}
|
