Merge pull request #395 from LorenDB/master
A few small things
5 files changed, 6 insertions, 3 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 19dfc26b..5419532b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,6 +26,7 @@ If applicable, add screenshots to help explain your problem.
### System:
- Nheko version: <!-- Get the version from the settings menu (bottom left corner) -->
+- Profile used: <!-- If you are not using the default profile, mention it here -->
- Installation method: <!-- AppImage, some repository, local build etc -->
- Operating System:
- Qt version: <!-- If you compiled it yourself -->
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03fc50c..319d9cc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,7 +261,7 @@ set(SRC_FILES
# Emoji
src/emoji/EmojiModel.cpp
- src/emoji/Provider_new.cpp
+ src/emoji/Provider.cpp
# Timeline
diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index ff342be5..7b71bd7f 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -57,9 +57,9 @@ Popup {
completer = undefined;
}
}
- padding: 0
+ padding: 1
onAboutToShow: currentIndex = -1
- height: listView.contentHeight
+ height: listView.contentHeight + 2 // + 2 for the padding on top and bottom
Connections {
onTimelineChanged: completer = null
@@ -183,6 +183,7 @@ Popup {
color: colors.base
implicitHeight: popup.contentHeight
implicitWidth: popup.contentWidth
+ border.color: colors.mid
}
}
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index 17e698d6..8328f4a5 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -14,6 +14,7 @@ ApplicationWindow {
width: 420
minimumHeight: 420
palette: colors
+ color: colors.window
ColumnLayout {
id: contentL
diff --git a/src/emoji/Provider_new.cpp b/src/emoji/Provider.cpp
index 2cdef7ad..2cdef7ad 100644
--- a/src/emoji/Provider_new.cpp
+++ b/src/emoji/Provider.cpp
|
