Changeset dc5c303 in mainline for uspace/app/taskbar/types/taskbar.h

Timestamp:

2023-12-28T13:59:23Z (15 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/app/taskbar/types/taskbar.h (modified) (4 diffs)

uspace/app/taskbar/types/taskbar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /**
- * @file Task Bar types
+ * @file Taskbar types
  */
 
@@ -43 +43 @@
 #include <ui/window.h>
 #include "clock.h"
+#include "tbsmenu.h"
 #include "wndlist.h"
 
-/** Task bar */
+/** Taskbar */
 typedef struct taskbar {
         /** User interface */
@@ -53 +54 @@
         /** Fixed layout */
         ui_fixed_t *fixed;
-        ui_label_t *label;
+        /** Start menu */
+        tbsmenu_t *tbsmenu;
         /** Window list */
         wndlist_t *wndlist;