Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

emoji popup smaller #115

Merged
merged 5 commits into from
Jan 21, 2024
Merged

emoji popup smaller #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c842d7
less verbose
zoff99 Jan 20, 2024
ab51dbc
open emoji popup for CI screenshots
zoff99 Jan 21, 2024
674acaa
less height for emoji popup box
zoff99 Jan 21, 2024
586020a
capture screen before windowmanager ist started
zoff99 Jan 21, 2024
0e0d84d
add sleep
zoff99 Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,8 @@ jobs:
./do_run.sh $(cat /Users/runner/work/trifa_material/trifa_material/toxid.txt) >/dev/null 2>/dev/null &
sleep 58
cliclick -m verbose c:195,347
sleep 1
cliclick -m verbose c:745,645
sleep 90
sleep 120
pwd
Expand Down Expand Up @@ -590,6 +592,10 @@ jobs:
printf './do_run.sh $(cat /home/runner/work/trifa_material/trifa_material/toxid.txt) >/dev/null 2>/dev/null &\n' >> /tmp/a.sh
printf 'sleep 220\n' >> /tmp/a.sh
printf 'xdotool mousemove --sync 214 295 click 1\n' >> /tmp/a.sh
printf 'sleep 4\n' >> /tmp/a.sh
printf 'xdotool mousemove --sync 750 643 click 1\n' >> /tmp/a.sh
printf 'sleep 2\n' >> /tmp/a.sh
printf 'import -window root /tmp/screenshot-linux_before_wm.png\n' >> /tmp/a.sh
printf 'sleep 40\n' >> /tmp/a.sh
printf 'fvwm2 &' >> /tmp/a.sh
printf 'sleep 20\n' >> /tmp/a.sh
Expand All @@ -611,6 +617,12 @@ jobs:
name: screenshot-linux
path: /tmp/screenshot-linux.png

- name: upload-screenshots
uses: actions/upload-artifact@v3
with:
name: screenshot-linux
path: /tmp/screenshot-linux_before_wm.png

- name: Upload to nightly release
uses: ncipollo/release-action@v1
if: github.ref == 'refs/heads/master'
Expand Down Expand Up @@ -713,6 +725,13 @@ jobs:
$SendMouseClick::mouse_event(0x00000002, 0, 0, 0, 0);
$SendMouseClick::mouse_event(0x00000004, 0, 0, 0, 0);
sleep -Seconds 02
$x = 735
$y = 613
[System.Windows.Forms.Cursor]::Position = New-Object System.Drawing.Point($x, $y)
sleep -Seconds 02
$SendMouseClick::mouse_event(0x00000002, 0, 0, 0, 0);
$SendMouseClick::mouse_event(0x00000004, 0, 0, 0, 0);
sleep -Seconds 02

- name: capture-screen
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/zoffcc/applications/trifa/HelperGeneric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ object HelperGeneric {
{
try
{
Log.i(TAG, "i=" + i + " s=" + strings[i])
// Log.i(TAG, "i=" + i + " s=" + strings[i])
if (strings[i].equals("thumbsup", ignoreCase = false))
{
output = output.replace(":" + strings[i] + ":", SearchEmojiManager().search(query = emojis[i]).first().emoji.variants.get(1).unicode, ignoreCase = true)
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/zoffcc/applications/trifa2/SendMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ fun SendMessage(focusRequester: FocusRequester, selectedContactPubkey: String?,
if (show_emoji_popup)
{
val emoji_box_width_dp = 250.dp
val emoji_box_height_dp = 500.dp
val emoji_box_height_dp = 230.dp
val emoji_box_offset_x_px = 100.dp.DpAsPx.toInt()
val emoji_box_offset_y_px = -(emoji_box_height_dp + 10.dp).DpAsPx.toInt()
Popup(alignment = Alignment.TopCenter,
Expand Down
Loading