Skip to content

Commit e9a4f8d

Browse files
committed
Fix rename textarea width, make cursor visible, reword reset name dialog
1 parent f645880 commit e9a4f8d

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

firmware/src/gui/pages/module_view/action_menu.hh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,12 @@ public:
6060
lv_hide(rename_textarea);
6161
lv_textarea_set_max_length(rename_textarea, AliasNameString::capacity);
6262
lv_textarea_set_one_line(rename_textarea, true);
63-
lv_obj_set_width(rename_textarea, 220); // screen width (240) minus 10px margin each side
63+
lv_obj_set_width(rename_textarea, 300); // screen width (320) minus 10px margin each side
6464
lv_obj_set_style_bg_opa(rename_textarea, LV_OPA_COVER, 0);
65+
lv_obj_set_style_border_color(rename_textarea, lv_color_white(), LV_PART_CURSOR | LV_STATE_DEFAULT);
66+
lv_obj_set_style_border_opa(rename_textarea, LV_OPA_COVER, LV_PART_CURSOR | LV_STATE_DEFAULT);
67+
lv_obj_set_style_border_width(rename_textarea, 1, LV_PART_CURSOR | LV_STATE_DEFAULT);
68+
lv_obj_set_style_border_side(rename_textarea, LV_BORDER_SIDE_LEFT, LV_PART_CURSOR | LV_STATE_DEFAULT);
6569
lv_obj_add_event_cb(rename_textarea, textarea_changed_cb, LV_EVENT_VALUE_CHANGED, this);
6670
lv_obj_set_x(ui_ModuleViewActionMenu, 160);
6771
lv_obj_set_height(ui_ModuleViewActionMenu, 240);
@@ -396,7 +400,7 @@ private:
396400
auto *pd = page->patches.get_view_patch();
397401
auto alias = pd->get_module_alias(static_cast<uint16_t>(page->module_idx));
398402
auto default_name = ModuleFactory::getModuleDisplayName(pd->module_slugs[page->module_idx]);
399-
msg = "Rename '" + std::string{alias} + "' to '" + std::string{default_name} + "'?";
403+
msg = "Reset module name to '" + std::string{default_name} + "'?";
400404
}
401405

402406
page->hide_menu();
@@ -435,18 +439,17 @@ private:
435439

436440
auto *pd = page->patches.get_view_patch();
437441
auto alias = pd->get_module_alias(static_cast<uint16_t>(page->module_idx));
438-
auto alias_str = std::string{alias};
439442

440443
// Show current alias (or module name) as greyed-out placeholder; don't pre-fill
441-
std::string_view placeholder = alias_str.empty()
444+
std::string_view placeholder = alias.empty()
442445
? ModuleFactory::getModuleDisplayName(pd->module_slugs[page->module_idx])
443-
: std::string_view{alias_str};
446+
: alias;
444447
lv_textarea_set_placeholder_text(page->rename_textarea, placeholder.data());
445448
lv_textarea_set_text(page->rename_textarea, "");
446449
lv_label_set_text(ui_ElementRollerModuleName, placeholder.data());
447450

448451
page->hide_menu();
449-
page->pending_alias = alias_str;
452+
page->pending_alias = alias;
450453
page->keyboard_entry.show_keyboard(
451454
page->rename_textarea,
452455
[page](std::string_view text) {

0 commit comments

Comments
 (0)