Changeset e0cf963 in mainline for uspace/lib

Timestamp:

2021-09-29T14:30:00Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9bf5da6f

Parents:

6c0766b

git-author:

Jiri Svoboda <jiri@…> (2021-09-28 14:29:47)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-29 14:30:00)

Message:

Set initial entry text for prompt and file dialog

Location:

uspace/lib/ui

Files:

• include/types/ui/filedialog.h (modified) (1 diff)
• include/types/ui/promptdialog.h (modified) (1 diff)
• src/filedialog.c (modified) (3 diffs)
• src/promptdialog.c (modified) (3 diffs)

uspace/lib/ui/include/types/ui/filedialog.h

@@ -49 +49 @@
         /** Window caption */
         const char *caption;
+        /** Initial file name */
+        const char *ifname;
 } ui_file_dialog_params_t;
 

uspace/lib/ui/include/types/ui/promptdialog.h

@@ -51 +51 @@
         /** Prompt text */
         const char *prompt;
+        /** Initial entry text */
+        const char *itext;
 } ui_prompt_dialog_params_t;
 

uspace/lib/ui/src/filedialog.c

@@ -76 +76 @@
 {
         memset(params, 0, sizeof(ui_file_dialog_params_t));
+        params->ifname = "";
 }
 
@@ -159 +160 @@
         label = NULL;
 
-        rc = ui_entry_create(window, "", &entry);
+        rc = ui_entry_create(window, params->ifname, &entry);
         if (rc != EOK)
                 goto error;
@@ -183 +184 @@
 
         ui_entry_activate(entry);
+
+        /* Select all */
+        ui_entry_seek_start(entry, false);
+        ui_entry_seek_end(entry, true);
 
         dialog->ename = entry;

uspace/lib/ui/src/promptdialog.c

@@ -76 +76 @@
 {
         memset(params, 0, sizeof(ui_prompt_dialog_params_t));
+        params->itext = "";
 }
 
@@ -159 +160 @@
         label = NULL;
 
-        rc = ui_entry_create(window, "", &entry);
+        rc = ui_entry_create(window, params->itext, &entry);
         if (rc != EOK)
                 goto error;
@@ -183 +184 @@
 
         ui_entry_activate(entry);
+
+        /* Select all */
+        ui_entry_seek_start(entry, false);
+        ui_entry_seek_end(entry, true);
 
         dialog->ename = entry;