Changes in uspace/lib/ui/src/filedialog.c [b979ffb:e0cf963] in mainline

File:

• uspace/lib/ui/src/filedialog.c (modified) (19 diffs)

uspace/lib/ui/src/filedialog.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <ui/label.h>
 #include <ui/filedialog.h>
-#include <ui/filelist.h>
 #include <ui/pbutton.h>
 #include <ui/resource.h>
@@ -48 +47 @@
 #include "../private/filedialog.h"
 
-static void ui_file_dialog_wnd_resize(ui_window_t *, void *);
 static void ui_file_dialog_wnd_close(ui_window_t *, void *);
 static void ui_file_dialog_wnd_kbd(ui_window_t *, void *, kbd_event_t *);
 
 ui_window_cb_t ui_file_dialog_wnd_cb = {
-        .resize = ui_file_dialog_wnd_resize,
         .close = ui_file_dialog_wnd_close,
         .kbd = ui_file_dialog_wnd_kbd
 };
 
-static void ui_file_dialog_flist_activate_req(ui_file_list_t *, void *);
-static void ui_file_dialog_flist_selected(ui_file_list_t *, void *,
-    const char *);
-
-ui_file_list_cb_t ui_file_dialog_flist_cb = {
-        .activate_req = ui_file_dialog_flist_activate_req,
-        .selected = ui_file_dialog_flist_selected
-};
-
 static void ui_file_dialog_bok_clicked(ui_pbutton_t *, void *);
 static void ui_file_dialog_bcancel_clicked(ui_pbutton_t *, void *);
@@ -89 +77 @@
         memset(params, 0, sizeof(ui_file_dialog_params_t));
         params->ifname = "";
-}
-
-/** Compute file dialog geometry.
- *
- * @param ui User interface
- * @param wrect Window interior rectangle
- * @param geom Place to store geometry
- */
-static void ui_file_dialog_get_geom(ui_t *ui, gfx_rect_t *wrect,
-    ui_file_dialog_geom_t *geom)
-{
-        gfx_coord_t cx;
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                geom->fname_label_rect.p0.x = 3;
-                geom->fname_label_rect.p0.y = 2;
-                geom->fname_label_rect.p1.x = 17;
-                geom->fname_label_rect.p1.y = 3;
-        } else {
-                geom->fname_label_rect.p0.x = 10;
-                geom->fname_label_rect.p0.y = 35;
-                geom->fname_label_rect.p1.x = 190;
-                geom->fname_label_rect.p1.y = 50;
-        }
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                geom->entry_rect.p0.x = 3;
-                geom->entry_rect.p0.y = 3;
-                geom->entry_rect.p1.x = wrect->p1.x - 3;
-                geom->entry_rect.p1.y = 4;
-        } else {
-                geom->entry_rect.p0.x = 10;
-                geom->entry_rect.p0.y = 55;
-                geom->entry_rect.p1.x = wrect->p1.x - 10;
-                geom->entry_rect.p1.y = 80;
-        }
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                geom->files_label_rect.p0.x = 3;
-                geom->files_label_rect.p0.y = 5;
-                geom->files_label_rect.p1.x = 17;
-                geom->files_label_rect.p1.y = 6;
-        } else {
-                geom->files_label_rect.p0.x = 10;
-                geom->files_label_rect.p0.y = 90;
-                geom->files_label_rect.p1.x = 190;
-                geom->files_label_rect.p1.y = 105;
-        }
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                geom->flist_rect.p0.x = 3;
-                geom->flist_rect.p0.y = 6;
-                geom->flist_rect.p1.x = wrect->p1.x - 3;
-                geom->flist_rect.p1.y = wrect->p1.y - 4;
-        } else {
-                geom->flist_rect.p0.x = 10;
-                geom->flist_rect.p0.y = 110;
-                geom->flist_rect.p1.x = wrect->p1.x - 10;
-                geom->flist_rect.p1.y = wrect->p1.y - 55;
-        }
-
-        cx = (wrect->p0.x + wrect->p1.x) / 2;
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                geom->bok_rect.p0.x = cx - 10;
-                geom->bok_rect.p0.y = wrect->p1.y - 3;
-                geom->bok_rect.p1.x = cx;
-                geom->bok_rect.p1.y = wrect->p1.y - 2;
-        } else {
-                geom->bok_rect.p0.x = cx - 95;
-                geom->bok_rect.p0.y = wrect->p1.y - 45;
-                geom->bok_rect.p1.x = cx - 5;
-                geom->bok_rect.p1.y = wrect->p1.y - 17;
-        }
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                geom->bcancel_rect.p0.x = cx + 2;
-                geom->bcancel_rect.p0.y = wrect->p1.y - 3;
-                geom->bcancel_rect.p1.x = cx + 12;
-                geom->bcancel_rect.p1.y = wrect->p1.y - 2;
-        } else {
-                geom->bcancel_rect.p0.x = cx + 5;
-                geom->bcancel_rect.p0.y = wrect->p1.y - 45;
-                geom->bcancel_rect.p1.x = cx + 95;
-                geom->bcancel_rect.p1.y = wrect->p1.y - 17;
-        }
 }
 
@@ -200 +96 @@
         ui_label_t *label = NULL;
         ui_entry_t *entry = NULL;
-        ui_file_list_t *flist = NULL;
         ui_pbutton_t *bok = NULL;
         ui_pbutton_t *bcancel = NULL;
-        ui_file_dialog_geom_t geom;
-        gfx_rect_t arect;
+        gfx_rect_t rect;
         ui_resource_t *ui_res;
 
@@ -215 +109 @@
         ui_wnd_params_init(&wparams);
         wparams.caption = params->caption;
-        wparams.style |= ui_wds_maximize_btn | ui_wds_resizable;
 
         /* FIXME: Auto layout */
@@ -222 +115 @@
                 wparams.rect.p0.y = 0;
                 wparams.rect.p1.x = 40;
-                wparams.rect.p1.y = 20;
-
-                wparams.min_size.x = 30;
-                wparams.min_size.y = 10;
+                wparams.rect.p1.y = 9;
         } else {
                 wparams.rect.p0.x = 0;
                 wparams.rect.p0.y = 0;
                 wparams.rect.p1.x = 300;
-                wparams.rect.p1.y = 335;
-
-                wparams.min_size.x = 240;
-                wparams.min_size.y = 260;
+                wparams.rect.p1.y = 135;
         }
 
@@ -242 +129 @@
         ui_window_set_cb(window, &ui_file_dialog_wnd_cb, dialog);
 
-        ui_window_get_app_rect(window, &arect);
         ui_res = ui_window_get_res(window);
 
-        /* Compute geometry. */
-        ui_file_dialog_get_geom(ui, &arect, &geom);
-
         rc = ui_fixed_create(&fixed);
         if (rc != EOK)
@@ -256 +139 @@
                 goto error;
 
-        ui_label_set_rect(label, &geom.fname_label_rect);
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 3;
+                rect.p0.y = 2;
+                rect.p1.x = 17;
+                rect.p1.y = 3;
+        } else {
+                rect.p0.x = 10;
+                rect.p0.y = 35;
+                rect.p1.x = 190;
+                rect.p1.y = 50;
+        }
+
+        ui_label_set_rect(label, &rect);
 
         rc = ui_fixed_add(fixed, ui_label_ctl(label));
@@ -268 +164 @@
                 goto error;
 
-        ui_entry_set_rect(entry, &geom.entry_rect);
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 3;
+                rect.p0.y = 4;
+                rect.p1.x = 37;
+                rect.p1.y = 5;
+        } else {
+                rect.p0.x = 10;
+                rect.p0.y = 55;
+                rect.p1.x = 290;
+                rect.p1.y = 80;
+        }
+
+        ui_entry_set_rect(entry, &rect);
 
         rc = ui_fixed_add(fixed, ui_entry_ctl(entry));
@@ -283 +192 @@
         entry = NULL;
 
-        /* Files label */
-        rc = ui_label_create(ui_res, "Files:", &label);
-        if (rc != EOK)
-                goto error;
-
-        ui_label_set_rect(label, &geom.files_label_rect);
-
-        rc = ui_fixed_add(fixed, ui_label_ctl(label));
-        if (rc != EOK)
-                goto error;
-
-        label = NULL;
-
-        /* File list */
-
-        rc = ui_file_list_create(window, false, &flist);
-        if (rc != EOK)
-                goto error;
-
-        ui_file_list_set_rect(flist, &geom.flist_rect);
-        ui_file_list_set_cb(flist, &ui_file_dialog_flist_cb, dialog);
-
-        rc = ui_fixed_add(fixed, ui_file_list_ctl(flist));
-        if (rc != EOK)
-                goto error;
-
-        dialog->flist = flist;
-        flist = NULL;
-
-        rc = ui_file_list_read_dir(dialog->flist, ".");
-        if (rc != EOK)
-                goto error;
-
-        /* OK button */
-
         rc = ui_pbutton_create(ui_res, "OK", &bok);
         if (rc != EOK)
@@ -323 +197 @@
 
         ui_pbutton_set_cb(bok, &ui_file_dialog_bok_cb, dialog);
-        ui_pbutton_set_rect(bok, &geom.bok_rect);
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 10;
+                rect.p0.y = 6;
+                rect.p1.x = 20;
+                rect.p1.y = 7;
+        } else {
+                rect.p0.x = 55;
+                rect.p0.y = 90;
+                rect.p1.x = 145;
+                rect.p1.y = 118;
+        }
+
+        ui_pbutton_set_rect(bok, &rect);
+
         ui_pbutton_set_default(bok, true);
 
@@ -333 +222 @@
         bok = NULL;
 
-        /* Cancel button */
-
         rc = ui_pbutton_create(ui_res, "Cancel", &bcancel);
         if (rc != EOK)
@@ -340 +227 @@
 
         ui_pbutton_set_cb(bcancel, &ui_file_dialog_bcancel_cb, dialog);
-        ui_pbutton_set_rect(bcancel, &geom.bcancel_rect);
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 22;
+                rect.p0.y = 6;
+                rect.p1.x = 32;
+                rect.p1.y = 7;
+        } else {
+                rect.p0.x = 155;
+                rect.p0.y = 90;
+                rect.p1.x = 245;
+                rect.p1.y = 118;
+        }
+
+        ui_pbutton_set_rect(bcancel, &rect);
 
         rc = ui_fixed_add(fixed, ui_pbutton_ctl(bcancel));
@@ -362 +263 @@
         if (entry != NULL)
                 ui_entry_destroy(entry);
-        if (flist != NULL)
-                ui_file_list_destroy(flist);
         if (bok != NULL)
                 ui_pbutton_destroy(bok);
@@ -405 +304 @@
 }
 
-/** File dialog window resize handler.
+/** File dialog window close handler.
  *
  * @param window Window
  * @param arg Argument (ui_file_dialog_t *)
  */
-static void ui_file_dialog_wnd_resize(ui_window_t *window, void *arg)
-{
-        ui_file_dialog_t *dialog = (ui_file_dialog_t *) arg;
-        gfx_rect_t arect;
-        ui_file_dialog_geom_t geom;
-
-        /* Get new window application rectangle. */
-        ui_window_get_app_rect(window, &arect);
-
-        /* Compute geometry. */
-        ui_file_dialog_get_geom(ui_window_get_ui(window), &arect, &geom);
-
-        ui_entry_set_rect(dialog->ename, &geom.entry_rect);
-        ui_file_list_set_rect(dialog->flist, &geom.flist_rect);
-        ui_pbutton_set_rect(dialog->bok, &geom.bok_rect);
-        ui_pbutton_set_rect(dialog->bcancel, &geom.bcancel_rect);
-
-        (void)ui_window_paint(window);
-}
-
-/** File dialog window close handler.
- *
- * @param window Window
- * @param arg Argument (ui_file_dialog_t *)
- */
 static void ui_file_dialog_wnd_close(ui_window_t *window, void *arg)
 {
@@ -446 +320 @@
  *
  * @param window Window
- * @param arg Argument (ui_file_dialog_t *)
+ * @param arg Argument (ui_prompt_dialog_t *)
  * @param event Keyboard event
  */
@@ -454 +328 @@
         ui_file_dialog_t *dialog = (ui_file_dialog_t *) arg;
         const char *fname;
-        ui_evclaim_t claim;
-
-        claim = ui_window_def_kbd(window, event);
-        if (claim == ui_claimed)
-                return;
 
         if (event->type == KEY_PRESS &&
@@ -477 +346 @@
                 }
         }
-}
-
-static void ui_file_dialog_flist_activate_req(ui_file_list_t *flist, void *arg)
-{
-        ui_file_dialog_t *dialog = (ui_file_dialog_t *) arg;
-
-        ui_file_list_activate(dialog->flist);
-        ui_entry_deactivate(dialog->ename);
-}
-
-static void ui_file_dialog_flist_selected(ui_file_list_t *flist, void *arg,
-    const char *fname)
-{
-        ui_file_dialog_t *dialog = (ui_file_dialog_t *) arg;
-
-        dialog->cb->bok(dialog, dialog->arg, fname);
+
+        ui_window_def_kbd(window, event);
 }