Changeset a65b0c8 in mainline

Timestamp:

2020-06-08T18:18:40Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

84e74ea

Parents:

8aef01c

Message:

Preview window with a non-filled rectangle

File:

• uspace/srv/hid/display/window.c (modified) (3 diffs)

uspace/srv/hid/display/window.c

@@ -247 +247 @@
         gfx_color_t *color;
         gfx_rect_t prect;
-        gfx_rect_t drect;
+        gfx_rect_t dr;
+        gfx_rect_t pr;
         gfx_context_t *gc;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_paint_preview");
 
         /*
@@ -262 +261 @@
         }
 
-        /* Clip rendering to the clipping rectangle */
-        gfx_rect_clip(&prect, rect, &drect);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_paint_preview");
+        prect.p0.x, prect.p0.y, prect.p1.x, prect.p1.y);
 
         rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
@@ -272 +271 @@
         if (gc != NULL) {
                 gfx_set_color(gc, color);
-                gfx_fill_rect(gc, &drect);
+
+                /*
+                 * TODO: Ideally we'd want XOR operation to make the preview
+                 * frame visible on any background. If we wanted to get really
+                 * fancy, we'd fill it with a pattern
+                 */
+
+                pr.p0.x = prect.p0.x;
+                pr.p0.y = prect.p0.y;
+                pr.p1.x = prect.p1.x;
+                pr.p1.y = prect.p0.y + 1;
+                gfx_rect_clip(&pr, rect, &dr);
+                gfx_fill_rect(gc, &dr);
+
+                pr.p0.x = prect.p0.x;
+                pr.p0.y = prect.p1.y - 1;
+                pr.p1.x = prect.p1.x;
+                pr.p1.y = prect.p1.y;
+                gfx_rect_clip(&pr, rect, &dr);
+                gfx_fill_rect(gc, &dr);
+
+                pr.p0.x = prect.p0.x;
+                pr.p0.y = prect.p0.y;
+                pr.p1.x = prect.p0.x + 1;
+                pr.p1.y = prect.p1.y;
+                gfx_rect_clip(&pr, rect, &dr);
+                gfx_fill_rect(gc, &dr);
+
+                pr.p0.x = prect.p1.x - 1;
+                pr.p0.y = prect.p0.y;
+                pr.p1.x = prect.p1.x;
+                pr.p1.y = prect.p1.y;
+                gfx_rect_clip(&pr, rect, &dr);
+                gfx_fill_rect(gc, &dr);
+
         }