Merge pull request 'redesigned emoji drawer' (#421) from emodrawer2 into master

Reviewed-on: #421
2020-11-26 14:25:23 -08:00 · 2020-11-26 14:25:23 -08:00 · 1eb391ecc1
parent 78400a17c6 e74d599d95
commit 1eb391ecc1
27 changed files with 5 additions and 2 deletions
--- a/assets/core/fontawesome/regular/check-circle.webp
+++ b/assets/core/fontawesome/regular/check-circle.webp
--- a/assets/core/fontawesome/regular/hourglass.webp
+++ b/assets/core/fontawesome/regular/hourglass.webp
--- a/assets/core/fontawesome/regular/user.webp
+++ b/assets/core/fontawesome/regular/user.webp
--- a/assets/core/fontawesome/regular/window-close.webp
+++ b/assets/core/fontawesome/regular/window-close.webp
--- a/assets/core/send-24px.webp
+++ b/assets/core/send-24px.webp
--- a/assets/emojidrawer/darkmode_airplane.webp
+++ b/assets/emojidrawer/darkmode_airplane.webp
--- a/assets/emojidrawer/darkmode_bear.webp
+++ b/assets/emojidrawer/darkmode_bear.webp
--- a/assets/emojidrawer/darkmode_big_smile.webp
+++ b/assets/emojidrawer/darkmode_big_smile.webp
--- a/assets/emojidrawer/darkmode_crescent.webp
+++ b/assets/emojidrawer/darkmode_crescent.webp
--- a/assets/emojidrawer/darkmode_hash.webp
+++ b/assets/emojidrawer/darkmode_hash.webp
--- a/assets/emojidrawer/darkmode_light_bulb.webp
+++ b/assets/emojidrawer/darkmode_light_bulb.webp
--- a/assets/emojidrawer/darkmode_pentacle.webp
+++ b/assets/emojidrawer/darkmode_pentacle.webp
--- a/assets/emojidrawer/darkmode_red_apple.webp
+++ b/assets/emojidrawer/darkmode_red_apple.webp
--- a/assets/emojidrawer/darkmode_transgender_symbol.webp
+++ b/assets/emojidrawer/darkmode_transgender_symbol.webp
--- a/assets/emojidrawer/darkmode_volleyball.webp
+++ b/assets/emojidrawer/darkmode_volleyball.webp
--- a/assets/emojidrawer/lightmode_airplane.webp
+++ b/assets/emojidrawer/lightmode_airplane.webp
--- a/assets/emojidrawer/lightmode_bear.webp
+++ b/assets/emojidrawer/lightmode_bear.webp
--- a/assets/emojidrawer/lightmode_big_smile.webp
+++ b/assets/emojidrawer/lightmode_big_smile.webp
--- a/assets/emojidrawer/lightmode_crescent.webp
+++ b/assets/emojidrawer/lightmode_crescent.webp
--- a/assets/emojidrawer/lightmode_hash.webp
+++ b/assets/emojidrawer/lightmode_hash.webp
--- a/assets/emojidrawer/lightmode_light_bulb.webp
+++ b/assets/emojidrawer/lightmode_light_bulb.webp
--- a/assets/emojidrawer/lightmode_pentacle.webp
+++ b/assets/emojidrawer/lightmode_pentacle.webp
--- a/assets/emojidrawer/lightmode_red_apple.webp
+++ b/assets/emojidrawer/lightmode_red_apple.webp
--- a/assets/emojidrawer/lightmode_transgender_symbol.webp
+++ b/assets/emojidrawer/lightmode_transgender_symbol.webp
--- a/assets/emojidrawer/lightmode_volleyball.webp
+++ b/assets/emojidrawer/lightmode_volleyball.webp
--- a/qml/opaque
+++ b/qml/opaque
@ -1 +1 @@
-Subproject commit a69fb3cff29a56fd2ea9c3b3d2b61f4ebe34e3c7
+Subproject commit dab30aa1643cf21cd2c0bd6928a2edbf0952cffa
--- a/qml/widgets/MessageEditor.qml
+++ b/qml/widgets/MessageEditor.qml
@ -210,8 +210,11 @@ ColumnLayout {
                id: btnSend
                source: gcd.assetPath + "core/send-24px.webp"
                width: colRight.width
-                height: 50 * gcd.themeScale
+                // floor(...) needed or else send icon won't scale properly(?!?)
+                height: Math.floor(50 * gcd.themeScale)
                size: 36 * gcd.themeScale
+                sourceWidth: size
+                sourceHeight: size

                backgroundColor: enabled ? Theme.defaultButtonColor : Theme.defaultButtonDisabledColor
                hilightBackgroundColor: Theme.defaultButtonActiveColor