Changeset ebb1489 in mainline for uspace/lib/ui/include

Timestamp:

2024-10-13T08:23:40Z (18 months ago)

Author:

GitHub <noreply@…>

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

Location:

uspace/lib/ui/include

Files:

• types/ui/menubar.h (modified) (2 diffs)
• types/ui/testctl.h (modified) (2 diffs)
• types/ui/window.h (modified) (3 diffs)
• ui/menubar.h (modified) (2 diffs)
• ui/window.h (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 typedef struct ui_menu_bar ui_menu_bar_t;
 
+/** Menu bar callbacks */
+typedef struct ui_menu_bar_cb {
+        /** Activated */
+        void (*activate)(ui_menu_bar_t *, void *);
+        /** Deactivated */
+        void (*deactivate)(ui_menu_bar_t *, void *);
+} ui_menu_bar_cb_t;
+
 #endif
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #ifndef _UI_TYPES_TESTCTL_H
 #define _UI_TYPES_TESTCTL_H
+
+#include <errno.h>
+#include <io/kbd_event.h>
+#include <io/pos_event.h>
+#include <stdbool.h>
+#include <types/ui/event.h>
 
 struct ui_test_ctl;

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -80 +80 @@
         /** Window rectangle */
         gfx_rect_t rect;
+        /** Minimum size to which window can be resized */
+        gfx_coord2_t min_size;
         /** Window caption */
         const char *caption;
@@ -100 +102 @@
         void (*maximize)(ui_window_t *, void *);
         void (*unmaximize)(ui_window_t *, void *);
+        void (*resize)(ui_window_t *, void *);
         void (*close)(ui_window_t *, void *);
         void (*focus)(ui_window_t *, void *, unsigned);

uspace/lib/ui/include/ui/menubar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -52 +52 @@
     ui_menu_bar_t **);
 extern void ui_menu_bar_destroy(ui_menu_bar_t *);
+extern void ui_menu_bar_set_cb(ui_menu_bar_t *, ui_menu_bar_cb_t *, void *);
 extern ui_control_t *ui_menu_bar_ctl(ui_menu_bar_t *);
 extern void ui_menu_bar_set_rect(ui_menu_bar_t *, gfx_rect_t *);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -74 +74 @@
 extern void ui_window_def_pos(ui_window_t *, pos_event_t *);
 extern void ui_window_def_unfocus(ui_window_t *, unsigned);
+extern void ui_window_def_resize(ui_window_t *);
 
 #endif