Merge pull request 'redesigned emoji drawer' (#421) from emodrawer2 into master
the build was successful
Details
Reviewed-on: #421
After Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 262 B |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 888 B |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 2.3 KiB |
|
@ -1 +1 @@
|
||||||
Subproject commit a69fb3cff29a56fd2ea9c3b3d2b61f4ebe34e3c7
|
Subproject commit dab30aa1643cf21cd2c0bd6928a2edbf0952cffa
|
|
@ -210,8 +210,11 @@ ColumnLayout {
|
||||||
id: btnSend
|
id: btnSend
|
||||||
source: gcd.assetPath + "core/send-24px.webp"
|
source: gcd.assetPath + "core/send-24px.webp"
|
||||||
width: colRight.width
|
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
|
size: 36 * gcd.themeScale
|
||||||
|
sourceWidth: size
|
||||||
|
sourceHeight: size
|
||||||
|
|
||||||
backgroundColor: enabled ? Theme.defaultButtonColor : Theme.defaultButtonDisabledColor
|
backgroundColor: enabled ? Theme.defaultButtonColor : Theme.defaultButtonDisabledColor
|
||||||
hilightBackgroundColor: Theme.defaultButtonActiveColor
|
hilightBackgroundColor: Theme.defaultButtonActiveColor
|
||||||
|
|