Changeset 2d879f7 in mainline for uspace/lib/ui/include

Timestamp:

2020-11-26T11:59:59Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

554a5f1

Parents:

d8ddf7a

git-author:

Jiri Svoboda <jiri@…> (2020-11-25 18:46:07)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-26 11:59:59)

Message:

Basic support for window resizing

Location:

uspace/lib/ui/include

Files:

• types/ui/cursor.h (added)
• types/ui/wdecor.h (modified) (2 diffs)
• types/ui/window.h (modified) (2 diffs)
• ui/wdecor.h (modified) (1 diff)

uspace/lib/ui/include/types/ui/wdecor.h

@@ -38 +38 @@
 
 #include <gfx/coord.h>
+#include <types/ui/cursor.h>
 
 struct ui_wdecor;
 typedef struct ui_wdecor ui_wdecor_t;
+
+/** Window decoration style */
+typedef enum {
+        ui_wds_none = 0x0,
+        ui_wds_resizable = 0x1
+} ui_wdecor_style_t;
+
+/** Window resize type */
+typedef enum {
+        ui_wr_none = 0,
+
+        ui_wr_top = 0x1,
+        ui_wr_left = 0x2,
+        ui_wr_bottom = 0x4,
+        ui_wr_right = 0x8,
+
+        ui_wr_top_left = ui_wr_top | ui_wr_left,
+        ui_wr_bottom_left = ui_wr_bottom | ui_wr_left,
+        ui_wr_bottom_right = ui_wr_bottom | ui_wr_right,
+        ui_wr_top_right = ui_wr_top | ui_wr_right
+} ui_wdecor_rsztype_t;
 
 /** Window decoration callbacks */
@@ -46 +68 @@
         void (*close)(ui_wdecor_t *, void *);
         void (*move)(ui_wdecor_t *, void *, gfx_coord2_t *);
+        void (*resize)(ui_wdecor_t *, void *, ui_wdecor_rsztype_t,
+            gfx_coord2_t *);
+        void (*set_cursor)(ui_wdecor_t *, void *, ui_stock_cursor_t);
 } ui_wdecor_cb_t;
 

uspace/lib/ui/include/types/ui/window.h

@@ -40 +40 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <types/ui/wdecor.h>
 
 struct ui_window;
@@ -64 +65 @@
         /** Window caption */
         const char *caption;
+        /** Window decoration style */
+        ui_wdecor_style_t style;
         /** Window placement */
         ui_wnd_placement_t placement;

uspace/lib/ui/include/ui/wdecor.h

@@ -45 +45 @@
 
 extern errno_t ui_wdecor_create(ui_resource_t *, const char *,
-    ui_wdecor_t **);
+    ui_wdecor_style_t, ui_wdecor_t **);
 extern void ui_wdecor_destroy(ui_wdecor_t *);
 extern void ui_wdecor_set_cb(ui_wdecor_t *, ui_wdecor_cb_t *, void *);