Changeset 1b443cc0 in mainline

Timestamp:

2020-04-07T18:17:15Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

71eff34

Parents:

76a02db

git-author:

Jiri Svoboda <jiri@…> (2020-04-07 18:08:49)

git-committer:

Jiri Svoboda <jiri@…> (2020-04-07 18:17:15)

Message:

Avoid artifacts when moving window

Location:

uspace/srv/hid/display

Files:

• types/display/window.h (modified) (1 diff)
• window.c (modified) (3 diffs)

uspace/srv/hid/display/types/display/window.h

@@ -70 +70 @@
         /** Display position */
         gfx_coord2_t dpos;
+        /** Preview position */
+        gfx_coord2_t preview_pos;
         /** Minimum size */
         gfx_coord2_t min_size;

uspace/srv/hid/display/window.c

@@ -409 +409 @@
 static void ds_window_start_move(ds_window_t *wnd, gfx_coord2_t *pos)
 {
+        gfx_color_t *color;
+        gfx_context_t *gc;
+        gfx_rect_t drect;
+        errno_t rc;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_start_move (%d, %d)",
             (int) pos->x, (int) pos->y);
@@ -417 +422 @@
         wnd->orig_pos = *pos;
         wnd->state = dsw_moving;
+        wnd->preview_pos = wnd->dpos;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
+        if (rc != EOK)
+                return;
+
+        gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
+
+        gc = ds_display_get_gc(wnd->display); // XXX
+        if (gc != NULL) {
+                gfx_set_color(gc, color);
+                gfx_fill_rect(gc, &drect);
+        }
+
+        gfx_color_delete(color);
 }
 
@@ -464 +484 @@
                 return;
 
-        gfx_rect_translate(&wnd->dpos, &wnd->rect, &drect);
-
-        gc = ds_display_get_gc(wnd->display); // XXX
-        if (gc != NULL) {
-                gfx_set_color(gc, wnd->display->bg_color);
-                gfx_fill_rect(gc, &drect);
-        }
+        gfx_rect_translate(&wnd->preview_pos, &wnd->rect, &drect);
+        ds_display_paint(wnd->display, &drect);
 
         gfx_coord2_subtract(pos, &wnd->orig_pos, &dmove);
 
         gfx_coord2_add(&wnd->dpos, &dmove, &nwpos);
+        wnd->preview_pos = nwpos;
+
         gfx_rect_translate(&nwpos, &wnd->rect, &drect);
-
-        wnd->orig_pos = *pos;
-        wnd->dpos = nwpos;
 
         rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);