Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 05:48:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

HID App: Add few missing things from last merge

Browse Source
This commit is contained in:
Willy-JL
2024-05-18 08:31:36 +01:00
parent 23ca7e7b48
commit 7c013c0534
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/system/hid_app/views/hid_mouse.c
View File

@@ -201,6 +201,15 @@ static bool hid_mouse_input_callback(InputEvent* event, void* context) {
if(event->type == InputTypeLong && event->key == InputKeyBack) { if(event->type == InputTypeLong && event->key == InputKeyBack) {
hid_hal_mouse_release_all(hid_mouse->hid); hid_hal_mouse_release_all(hid_mouse->hid);
with_view_model(
hid_mouse->view,
HidMouseModel * model,
{
model->left_mouse_held = false;
model->left_mouse_pressed = false;
},
false);
} else { } else {
hid_mouse_process(hid_mouse, event); hid_mouse_process(hid_mouse, event);
consumed = true; consumed = true;

43
applications/system/hid_app/views/hid_mouse_clicker.c
View File

@@ -52,37 +52,37 @@ static void hid_mouse_clicker_draw_callback(Canvas* canvas, void* context) {
#endif #endif
canvas_set_font(canvas, FontPrimary); canvas_set_font(canvas, FontPrimary);
elements_multiline_text_aligned(canvas, 27, 3, AlignLeft, AlignTop, "Mouse Clicker"); elements_multiline_text_aligned(canvas, 17, 3, AlignLeft, AlignTop, "Mouse Clicker");
canvas_set_font(canvas, FontSecondary);
// Ok // Ok
canvas_draw_icon(canvas, 63, 25, &I_Space_65x18); canvas_draw_icon(canvas, 58, 25, &I_Space_65x18);
if(model->running) { if(model->running) {
canvas_set_font(canvas, FontPrimary); elements_slightly_rounded_box(canvas, 61, 27, 60, 13);
FuriString* rate_label = furi_string_alloc();
furi_string_printf(rate_label, "%d clicks/s\n\nUp / Down", model->rate);
elements_multiline_text(canvas, AlignLeft, 35, furi_string_get_cstr(rate_label));
canvas_set_font(canvas, FontSecondary);
furi_string_free(rate_label);
elements_slightly_rounded_box(canvas, 66, 27, 60, 13);
canvas_set_color(canvas, ColorWhite); canvas_set_color(canvas, ColorWhite);
} else {
canvas_set_font(canvas, FontPrimary);
elements_multiline_text(canvas, AlignLeft, 35, "Press Start\nto start\nclicking");
canvas_set_font(canvas, FontSecondary);
} }
canvas_draw_icon(canvas, 74, 29, &I_Ok_btn_9x9);
canvas_draw_icon(canvas, 69, 29, &I_Ok_btn_9x9);
if(model->running) { if(model->running) {
elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Stop"); elements_multiline_text_aligned(canvas, 86, 37, AlignLeft, AlignBottom, "Stop");
} else { } else {
elements_multiline_text_aligned(canvas, 91, 36, AlignLeft, AlignBottom, "Start"); elements_multiline_text_aligned(canvas, 86, 37, AlignLeft, AlignBottom, "Start");
} }
canvas_set_color(canvas, ColorBlack); canvas_set_color(canvas, ColorBlack);
// Clicks/s
char label[20];
snprintf(label, sizeof(label), "%d clicks/s", model->rate);
elements_multiline_text_aligned(canvas, 28, 37, AlignCenter, AlignBottom, label);
canvas_draw_icon(canvas, 25, 20, &I_ButtonUp_7x4);
canvas_draw_icon(canvas, 25, 44, &I_ButtonDown_7x4);
// Back // Back
canvas_draw_icon(canvas, 74, 49, &I_Pin_back_arrow_10x8); canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8);
elements_multiline_text_aligned(canvas, 91, 57, AlignLeft, AlignBottom, "Quit"); elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Exit");
} }
static void hid_mouse_clicker_timer_callback(void* context) { static void hid_mouse_clicker_timer_callback(void* context) {
@@ -144,6 +144,9 @@ static bool hid_mouse_clicker_input_callback(InputEvent* event, void* context) {
rate_changed = true; rate_changed = true;
consumed = true; consumed = true;
break; break;
case InputKeyBack:
model->running = false;
break;
default: default:
consumed = true; consumed = true;
break; break;