Merge pull request #395 from LorenDB/master

A few small things
pull/405/head
DeepBlueV7.X 4 years ago committed by GitHub
commit 049278bc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .github/ISSUE_TEMPLATE/bug_report.md
  2. 2
      CMakeLists.txt
  3. 5
      resources/qml/Completer.qml
  4. 1
      resources/qml/UserProfile.qml
  5. 0
      src/emoji/Provider.cpp

@ -26,6 +26,7 @@ If applicable, add screenshots to help explain your problem.
### System: ### System:
- Nheko version: <!-- Get the version from the settings menu (bottom left corner) --> - 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 --> - Installation method: <!-- AppImage, some repository, local build etc -->
- Operating System: - Operating System:
- Qt version: <!-- If you compiled it yourself --> - Qt version: <!-- If you compiled it yourself -->

@ -261,7 +261,7 @@ set(SRC_FILES
# Emoji # Emoji
src/emoji/EmojiModel.cpp src/emoji/EmojiModel.cpp
src/emoji/Provider_new.cpp src/emoji/Provider.cpp
# Timeline # Timeline

@ -57,9 +57,9 @@ Popup {
completer = undefined; completer = undefined;
} }
} }
padding: 0 padding: 1
onAboutToShow: currentIndex = -1 onAboutToShow: currentIndex = -1
height: listView.contentHeight height: listView.contentHeight + 2 // + 2 for the padding on top and bottom
Connections { Connections {
onTimelineChanged: completer = null onTimelineChanged: completer = null
@ -183,6 +183,7 @@ Popup {
color: colors.base color: colors.base
implicitHeight: popup.contentHeight implicitHeight: popup.contentHeight
implicitWidth: popup.contentWidth implicitWidth: popup.contentWidth
border.color: colors.mid
} }
} }

@ -14,6 +14,7 @@ ApplicationWindow {
width: 420 width: 420
minimumHeight: 420 minimumHeight: 420
palette: colors palette: colors
color: colors.window
ColumnLayout { ColumnLayout {
id: contentL id: contentL

Loading…
Cancel
Save