Changeset ef20a91 in mainline for uspace/lib/gui/window.c

Timestamp:

2020-05-22T17:16:45Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bea947f

Parents:

9901f267

git-author:

Jiri Svoboda <jiri@…> (2020-05-22 17:14:09)

git-committer:

Jiri Svoboda <jiri@…> (2020-05-22 17:16:45)

Message:

Larger resize areas around the corners of the window

The old corner resize areas were just 4x4 pixels (i.e. lying on both
window edges), way too small. We make proper corner resize areas
on the edge of the window, near the corners (up to 24 pixels away).

File:

• uspace/lib/gui/window.c (modified) (4 diffs)

uspace/lib/gui/window.c

@@ -67 +67 @@
 static sysarg_t header_min_width = 40;
 static sysarg_t close_thickness = 20;
+static sysarg_t corner_size = 24;
 
 static pixel_t color_highlight = PIXEL(255, 255, 255, 255);
@@ -289 +290 @@
 
                 bool btn_left = (event.btn_num == 1) && (event.type == POS_PRESS);
-                bool btn_right = (event.btn_num == 2) && (event.type == POS_PRESS);
-                bool allowed_button = btn_left || btn_right;
 
                 bool left = (event.hpos < border_thickness);
@@ -296 +295 @@
                 bool top = (event.vpos < border_thickness);
                 bool bottom = (event.vpos >= height - border_thickness);
+                bool edge = left || right || top || bottom;
+
+                bool cleft = (event.hpos < corner_size);
+                bool cright = (event.hpos >= width - corner_size);
+                bool ctop = (event.vpos < corner_size);
+                bool cbottom = (event.vpos >= height - corner_size);
+
                 bool header = (event.hpos >= border_thickness) &&
                     (event.hpos < width - border_thickness) &&
@@ -303 +309 @@
                     (event.hpos >= width - border_thickness - close_thickness);
 
-                if ((top && left) || (bottom && right))
-                        (void) set_cursor(widget->window, dcurs_size_uldr);
-                else if ((top && right) || (bottom && left))
-                        (void) set_cursor(widget->window, dcurs_size_urdl);
-                else if (top || bottom)
-                        (void) set_cursor(widget->window, dcurs_size_ud);
-                else if (left || right)
-                        (void) set_cursor(widget->window, dcurs_size_lr);
-                else
+                bool isresize = true;
+                display_wnd_rsztype_t rsztype = 0;
+
+                if (edge && ctop && cleft) {
+                        rsztype = display_wr_top_left;
+                } else if (edge && cbottom && cleft) {
+                        rsztype = display_wr_bottom_left;
+                } else if (edge && cbottom && cright) {
+                        rsztype = display_wr_bottom_right;
+                } else if (edge && ctop && cright) {
+                        rsztype = display_wr_top_right;
+                } else if (top) {
+                        rsztype = display_wr_top;
+                } else if (left) {
+                        rsztype = display_wr_left;
+                } else if (bottom) {
+                        rsztype = display_wr_bottom;
+                } else if (right) {
+                        rsztype = display_wr_right;
+                } else {
+                        isresize = false;
+                }
+
+                if (isresize) {
+                        (void) set_cursor(widget->window,
+                            display_cursor_from_wrsz(rsztype));
+                } else {
                         (void) set_cursor(widget->window, dcurs_arrow);
+                }
 
                 pos.x = event.hpos;
                 pos.y = event.vpos;
 
-                if (top && left && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_top_left, &pos);
-                } else if (bottom && left && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_bottom_left, &pos);
-                } else if (bottom && right && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_bottom_right, &pos);
-                } else if (top && right && allowed_button) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_top_right, &pos);
-                } else if (top && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_top, &pos);
-                } else if (left && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_left, &pos);
-                } else if (bottom && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_bottom, &pos);
-                } else if (right && btn_left) {
-                        (void) display_window_resize_req(widget->window->dwindow,
-                            display_wr_right, &pos);
+                if (isresize && btn_left) {
+                        (void) display_window_resize_req(
+                            widget->window->dwindow, rsztype, &pos);
                 } else if (close && btn_left) {
                         window_close(widget->window);