Changeset b8b031f in mainline

Timestamp:

2025-04-11T14:42:40Z (41 hours ago)

Author:

GitHub <noreply@…>

Children:

465ac5e

Parents:

c0d814a (diff), 8165a7a (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:

Wayne Thornton <wmthornton-dev@…> (2025-04-11 14:42:40)

git-committer:

GitHub <noreply@…> (2025-04-11 14:42:40)

Message:

Merge branch 'HelenOS:master' into master

Location:

uspace/app

Files:

• gfxdemo/gfxdemo.c (modified) (3 diffs)
• taskbar/taskbar.sif (modified) (1 diff)

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -1355 +1355 @@
         }
 
-        if (i >= argc || str_cmp(argv[i], "display") == 0) {
-                rc = demo_display(display_svc);
+        if (i >= argc || str_cmp(argv[i], "ui") == 0) {
+                rc = demo_ui(ui_display_spec);
                 if (rc != EOK)
                         return 1;
@@ -1363 +1363 @@
                 if (rc != EOK)
                         return 1;
-        } else if (str_cmp(argv[i], "ui") == 0) {
-                rc = demo_ui(ui_display_spec);
+        } else if (str_cmp(argv[i], "display") == 0) {
+                rc = demo_display(display_svc);
                 if (rc != EOK)
                         return 1;

uspace/app/taskbar/taskbar.sif

@@ -15 +15 @@
 <entry caption="~U~I Demo" cmd="/app/uidemo -d %d" terminal="n">
 </entry>
-<entry caption="~G~FX Demo" cmd="/app/gfxdemo -d %d ui" terminal="n">
+<entry caption="~G~FX Demo" cmd="/app/gfxdemo -d %d" terminal="n">
 </entry>
 <entry caption="~B~arber Pole" cmd="/app/barber -d %d" terminal="n">