Changeset d0fd86a in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

805a149

Parents:

9ee55cd

git-author:

Jiri Svoboda <jiri@…> (2021-10-24 22:14:11)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Simple way to prevent file names from overflowing the panel

File:

• uspace/app/nav/panel.c (modified) (1 diff)

uspace/app/nav/panel.c

@@ -207 +207 @@
                 return rc;
 
+        /*
+         * Make sure name does not overflow the entry rectangle.
+         *
+         * XXX We probably want to measure the text width, and,
+         * if it's too long, use gfx_text_find_pos() to find where
+         * it should be cut off (and append some sort of overflow
+         * marker.
+         */
+        rc = gfx_set_clip_rect(gc, &rect);
+        if (rc != EOK)
+                return rc;
+
         rc = gfx_puttext(font, &pos, &fmt, entry->name);
-        if (rc != EOK)
-                return rc;
-
-        return EOK;
+        if (rc != EOK) {
+                (void) gfx_set_clip_rect(gc, NULL);
+                return rc;
+        }
+
+        return gfx_set_clip_rect(gc, NULL);
 }