Changeset 1c6c3e1d in mainline for uspace/app/taskbar/types/taskbar.h

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

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

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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.

Message:

Merge branch 'master' into ticket

File:

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

uspace/app/taskbar/types/taskbar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <ui/window.h>
 #include "clock.h"
+#include "tbsmenu.h"
 #include "wndlist.h"
 
@@ -53 +54 @@
         /** Fixed layout */
         ui_fixed_t *fixed;
-        ui_label_t *label;
+        /** Start menu */
+        tbsmenu_t *tbsmenu;
         /** Window list */
         wndlist_t *wndlist;