Changeset dc0f6e4c in mainline for uspace/lib/ui/src/wdecor.c

Timestamp:

2023-10-24T16:50:46Z (17 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Parents:

29ed06d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-22 20:38:41)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-24 16:50:46)

Message:

Deduplicate identical enums for window resizing

File:

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

uspace/lib/ui/src/wdecor.c

@@ -650 +650 @@
  * @param pos_id Positioning device ID
  */
-void ui_wdecor_resize(ui_wdecor_t *wdecor, ui_wdecor_rsztype_t rsztype,
+void ui_wdecor_resize(ui_wdecor_t *wdecor, display_wnd_rsztype_t rsztype,
     gfx_coord2_t *pos, sysarg_t pos_id)
 {
@@ -912 +912 @@
  * @return Resize type
  */
-ui_wdecor_rsztype_t ui_wdecor_get_rsztype(ui_wdecor_t *wdecor,
+display_wnd_rsztype_t ui_wdecor_get_rsztype(ui_wdecor_t *wdecor,
     gfx_coord2_t *pos)
 {
@@ -923 +923 @@
         /* Window not resizable? */
         if ((wdecor->style & ui_wds_resizable) == 0)
-                return ui_wr_none;
+                return display_wr_none;
 
         /* Window is maximized? */
         if (wdecor->maximized)
-                return ui_wr_none;
+                return display_wr_none;
 
         /* Position not inside window? */
         if (!gfx_pix_inside_rect(pos, &wdecor->rect))
-                return ui_wr_none;
+                return display_wr_none;
 
         /* Position is within edge width from the outside */
@@ -950 +950 @@
         /* Top-left corner */
         if (edge && cleft && ctop)
-                return ui_wr_top_left;
+                return display_wr_top_left;
 
         /* Top-right corner */
         if (edge && cright && ctop)
-                return ui_wr_top_right;
+                return display_wr_top_right;
 
         /* Bottom-left corner */
         if (edge && cleft && cbottom)
-                return ui_wr_bottom_left;
+                return display_wr_bottom_left;
 
         /* Bottom-right corner */
         if (edge && cright && cbottom)
-                return ui_wr_bottom_right;
+                return display_wr_bottom_right;
 
         /* Left edge */
         if (eleft)
-                return ui_wr_left;
+                return display_wr_left;
 
         /* Right edge */
         if (eright)
-                return ui_wr_right;
+                return display_wr_right;
 
         /* Top edge */
         if (etop)
-                return ui_wr_top;
+                return display_wr_top;
 
         /* Bottom edge */
         if (ebottom)
-                return ui_wr_bottom;
-
-        return ui_wr_none;
+                return display_wr_bottom;
+
+        return display_wr_none;
 }
 
@@ -990 +990 @@
  * @return Cursor to use for this resize type
  */
-ui_stock_cursor_t ui_wdecor_cursor_from_rsztype(ui_wdecor_rsztype_t rsztype)
+ui_stock_cursor_t ui_wdecor_cursor_from_rsztype(display_wnd_rsztype_t rsztype)
 {
         switch (rsztype) {
-        case ui_wr_none:
+        case display_wr_none:
                 return ui_curs_arrow;
 
-        case ui_wr_top:
-        case ui_wr_bottom:
+        case display_wr_top:
+        case display_wr_bottom:
                 return ui_curs_size_ud;
 
-        case ui_wr_left:
-        case ui_wr_right:
+        case display_wr_left:
+        case display_wr_right:
                 return ui_curs_size_lr;
 
-        case ui_wr_top_left:
-        case ui_wr_bottom_right:
+        case display_wr_top_left:
+        case display_wr_bottom_right:
                 return ui_curs_size_uldr;
 
-        case ui_wr_top_right:
-        case ui_wr_bottom_left:
+        case display_wr_top_right:
+        case display_wr_bottom_left:
                 return ui_curs_size_urdl;
 
@@ -1074 +1074 @@
         gfx_coord2_t pos;
         sysarg_t pos_id;
-        ui_wdecor_rsztype_t rsztype;
+        display_wnd_rsztype_t rsztype;
         ui_stock_cursor_t cursor;
 
@@ -1089 +1089 @@
 
         /* Press on window border? */
-        if (rsztype != ui_wr_none && event->type == POS_PRESS)
+        if (rsztype != display_wr_none && event->type == POS_PRESS)
                 ui_wdecor_resize(wdecor, rsztype, &pos, pos_id);
 }