rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix white bar above emoji picker

Browse Source
This commit is contained in:
Nicolas Werner 2023-01-12 20:04:22 +01:00
parent 9877ba525d
commit 9b8eb0a412
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
resources/qml/emoji/EmojiPicker.qml
View File

@ -31,10 +31,11 @@ Menu {
popup(showAt ? showAt : null); popup(showAt ? showAt : null);
} }
margins: 0 margins: 2
bottomPadding: 1 bottomPadding: 0
leftPadding: 1 leftPadding: 0
rightPadding: 1 rightPadding: 0
topPadding: 0
modal: true modal: true
focus: true focus: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
@ -44,26 +45,24 @@ Menu {
Rectangle { Rectangle {
color: Nheko.colors.window color: Nheko.colors.window
height: columnView.implicitHeight + 4 height: columnView.implicitHeight + Nheko.paddingSmall*2
width: 7 * 52 + 20 width: 7 * 52 + 20
ColumnLayout { ColumnLayout {
id: columnView id: columnView
spacing: 0 spacing: Nheko.paddingSmall
anchors.leftMargin: 3 anchors.leftMargin: Nheko.paddingSmall
anchors.rightMargin: 3 anchors.rightMargin: Nheko.paddingSmall
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 2
// Search field // Search field
TextField { TextField {
id: emojiSearch id: emojiSearch
Layout.topMargin: 3 Layout.preferredWidth: 7 * 52 + 20 - Nheko.paddingSmall
Layout.preferredWidth: 7 * 52 + 20 - 6
palette: Nheko.colors palette: Nheko.colors
background: null background: null
placeholderTextColor: Nheko.colors.buttonText placeholderTextColor: Nheko.colors.buttonText
@ -74,9 +73,9 @@ Menu {
onTextChanged: searchTimer.restart() onTextChanged: searchTimer.restart()
onVisibleChanged: { onVisibleChanged: {
if (visible) if (visible)
forceActiveFocus(); forceActiveFocus();
else else
clear(); clear();
} }
Timer { Timer {
@ -89,37 +88,22 @@ Menu {
} }
} }
ToolButton { ImageButton {
id: clearSearch id: clearSearch
visible: emojiSearch.text !== '' 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 focusPolicy: Qt.NoFocus
onClicked: emojiSearch.clear() onClicked: emojiSearch.clear()
hoverEnabled: true hoverEnabled: true
background: null
anchors { anchors {
verticalCenter: parent.verticalCenter top: parent.top
bottom: parent.bottom
right: parent.right 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 // emoji grid
@ -128,7 +112,7 @@ Menu {
Layout.preferredHeight: cellHeight * 5 Layout.preferredHeight: cellHeight * 5
Layout.preferredWidth: 7 * 52 + 20 Layout.preferredWidth: 7 * 52 + 20
Layout.leftMargin: 4 Layout.leftMargin: 0
cellWidth: 52 cellWidth: 52
cellHeight: 52 cellHeight: 52
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds