From 0c6a2fb706a4d921396523235b5b4d4f2c8e593c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 12 Jan 2023 21:41:08 +0100 Subject: [PATCH] Fix white bar above sticker picker --- resources/qml/emoji/EmojiPicker.qml | 1 - resources/qml/emoji/StickerPicker.qml | 51 +++++++++------------------ 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index 42d8ad03..814f91eb 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -112,7 +112,6 @@ Menu { Layout.preferredHeight: cellHeight * 5 Layout.preferredWidth: 7 * 52 + 20 - Layout.leftMargin: 0 cellWidth: 52 cellHeight: 52 boundsBehavior: Flickable.StopAtBounds diff --git a/resources/qml/emoji/StickerPicker.qml b/resources/qml/emoji/StickerPicker.qml index db39f791..cfe5871f 100644 --- a/resources/qml/emoji/StickerPicker.qml +++ b/resources/qml/emoji/StickerPicker.qml @@ -34,10 +34,11 @@ Menu { popup(showAt ? showAt : null); } - margins: 0 - bottomPadding: 1 - leftPadding: 1 - rightPadding: 1 + margins: 2 + bottomPadding: 0 + leftPadding: 0 + rightPadding: 0 + topPadding: 0 modal: true focus: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside @@ -45,26 +46,24 @@ Menu { Rectangle { color: Nheko.colors.window - height: columnView.implicitHeight + 4 + height: columnView.implicitHeight + Nheko.paddingSmall*2 width: stickersPerRow * stickerDimPad + 20 ColumnLayout { id: columnView - spacing: 0 - anchors.leftMargin: 3 - anchors.rightMargin: 3 + spacing: Nheko.paddingSmall + anchors.leftMargin: Nheko.paddingSmall + anchors.rightMargin: Nheko.paddingSmall anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right - anchors.topMargin: 2 // Search field TextField { id: emojiSearch - Layout.topMargin: 3 - Layout.preferredWidth: stickersPerRow * stickerDimPad + 20 - 6 + Layout.preferredWidth: stickersPerRow * stickerDimPad + 20 - Nheko.paddingSmall palette: Nheko.colors background: null placeholderTextColor: Nheko.colors.buttonText @@ -87,37 +86,22 @@ Menu { onTriggered: stickerPopup.model.searchString = emojiSearch.text } - ToolButton { + ImageButton { id: clearSearch visible: emojiSearch.text !== '' - icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.svg?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) + + image: ":/icons/icons/ui/round-remove-button.svg" focusPolicy: Qt.NoFocus onClicked: emojiSearch.clear() hoverEnabled: true - background: null - anchors { - verticalCenter: parent.verticalCenter + top: parent.top + bottom: parent.bottom right: parent.right + rightMargin: Nheko.paddingSmall } - // clear the default hover effects. - - Image { - height: parent.height - 2 * Nheko.paddingSmall - width: height - source: "image://colorimage/:/icons/icons/ui/round-remove-button.svg?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) - - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - margins: Nheko.paddingSmall - } - - } - } - } // emoji grid @@ -126,8 +110,7 @@ Menu { model: roomid ? TimelineManager.completerFor("stickers", roomid) : null Layout.preferredHeight: cellHeight * 3.5 - Layout.preferredWidth: stickersPerRow * stickerDimPad + 20 - Layout.leftMargin: 4 + Layout.preferredWidth: stickersPerRow * stickerDimPad + 20 - Nheko.paddingSmall cellWidth: stickerDimPad cellHeight: stickerDimPad boundsBehavior: Flickable.StopAtBounds