Changeset 03fc3a9 in mainline for uspace/lib/ui/src/filelist.c

Timestamp:

2022-06-02T12:38:39Z (23 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fdf55a3

Parents:

11662bd

git-author:

Jiri Svoboda <jiri@…> (2022-06-01 18:37:42)

git-committer:

Jiri Svoboda <jiri@…> (2022-06-02 12:38:39)

Message:

Correct handling of partially visible file list entry

File:

• uspace/lib/ui/src/filelist.c (modified) (7 diffs)

uspace/lib/ui/src/filelist.c

@@ -185 +185 @@
         gfx_rect_t rect;
         gfx_rect_t lrect;
+        gfx_rect_t crect;
         gfx_color_t *bgcolor;
         char *caption;
@@ -198 +199 @@
         gfx_text_fmt_init(&fmt);
         fmt.font = font;
-        rows = ui_file_list_page_size(flist);
+        rows = ui_file_list_page_size(flist) + 1;
 
         /* Do not display entry outside of current page */
@@ -245 +246 @@
         rect.p1.y = rect.p0.y + line_height;
 
+        /* Clip to file list interior */
+        gfx_rect_clip(&rect, &lrect, &crect);
+
         rc = gfx_set_color(gc, bgcolor);
         if (rc != EOK)
                 return rc;
 
-        rc = gfx_fill_rect(gc, &rect);
+        rc = gfx_fill_rect(gc, &crect);
         if (rc != EOK)
                 return rc;
@@ -261 +265 @@
          * marker.
          */
-        rc = gfx_set_clip_rect(gc, &rect);
+        rc = gfx_set_clip_rect(gc, &crect);
         if (rc != EOK)
                 return rc;
@@ -325 +329 @@
         }
 
-        lines = ui_file_list_page_size(flist);
+        lines = ui_file_list_page_size(flist) + 1;
         i = 0;
 
@@ -477 +481 @@
 {
         gfx_coord_t line_height;
+        gfx_rect_t irect;
 
         line_height = ui_file_list_entry_height(flist);
-        return (flist->rect.p1.y - flist->rect.p0.y) / line_height;
+        ui_file_list_inside_rect(flist, &irect);
+        return (irect.p1.y - irect.p0.y) / line_height;
 }
 
@@ -943 +949 @@
         size_t idx;
 
-        assert(n < ui_file_list_page_size(flist));
+        assert(n <= ui_file_list_page_size(flist));
 
         entry = flist->page;