Changeset 7ca7215 in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2022-03-25T21:41:21Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0d1d0ea

Parents:

8965860c

Message:

Vertical scrollbar orientation

File:

• uspace/app/uidemo/uidemo.c (modified) (8 diffs)

uspace/app/uidemo/uidemo.c

@@ -620 +620 @@
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
-                params.rect.p1.x = 220;
+                params.rect.p1.x = 250;
                 params.rect.p1.y = 370;
         }
@@ -764 +764 @@
                 rect.p0.x = 2;
                 rect.p0.y = 3;
-                rect.p1.x = 42;
+                rect.p1.x = 39;
                 rect.p1.y = 4;
         } else {
@@ -850 +850 @@
 
         if (ui_is_textmode(ui)) {
-                rect.p0.x = 32;
+                rect.p0.x = 29;
                 rect.p0.y = 7;
-                rect.p1.x = 42;
+                rect.p1.x = 39;
                 rect.p1.y = 8;
         } else {
@@ -873 +873 @@
                 bparams.rect.p0.x = 0;
                 bparams.rect.p0.y = 0;
-                bparams.rect.p1.x = 40;
+                bparams.rect.p1.x = 37;
                 bparams.rect.p1.y = 2;
         } else {
@@ -1053 +1053 @@
                 rect.p0.x = 2;
                 rect.p0.y = 18;
-                rect.p1.x = 12;
+                rect.p1.x = 28;
                 rect.p1.y = 19;
         } else {
@@ -1070 +1070 @@
         }
 
-        rc = ui_scrollbar_create(ui, window, &demo.scrollbar);
+        rc = ui_scrollbar_create(ui, window, ui_sbd_horiz, &demo.hscrollbar);
         if (rc != EOK) {
                 printf("Error creating button.\n");
@@ -1076 +1076 @@
         }
 
-        ui_scrollbar_set_cb(demo.scrollbar, &scrollbar_cb, (void *) &demo);
+        ui_scrollbar_set_cb(demo.hscrollbar, &scrollbar_cb, (void *) &demo);
 
         /* FIXME: Auto layout */
@@ -1082 +1082 @@
                 rect.p0.x = 2;
                 rect.p0.y = 20;
-                rect.p1.x = 12;
+                rect.p1.x = 40;
                 rect.p1.y = 21;
         } else {
                 rect.p0.x = 15;
                 rect.p0.y = 340;
-                rect.p1.x = 210;
+                rect.p1.x = 220;
                 rect.p1.y = 362;
         }
 
-        ui_scrollbar_set_rect(demo.scrollbar, &rect);
-
-        ui_scrollbar_set_thumb_length(demo.scrollbar,
-            ui_scrollbar_through_length(demo.scrollbar) / 4);
-
-        rc = ui_fixed_add(demo.fixed, ui_scrollbar_ctl(demo.scrollbar));
+        ui_scrollbar_set_rect(demo.hscrollbar, &rect);
+
+        ui_scrollbar_set_thumb_length(demo.hscrollbar,
+            ui_scrollbar_through_length(demo.hscrollbar) / 4);
+
+        rc = ui_fixed_add(demo.fixed, ui_scrollbar_ctl(demo.hscrollbar));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_scrollbar_create(ui, window, ui_sbd_vert, &demo.vscrollbar);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_scrollbar_set_cb(demo.vscrollbar, &scrollbar_cb, (void *) &demo);
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 40;
+                rect.p0.y = 3;
+                rect.p1.x = 41;
+                rect.p1.y = 20;
+        } else {
+                rect.p0.x = 220;
+                rect.p0.y = 53;
+                rect.p1.x = 242;
+                rect.p1.y = 340;
+        }
+
+        ui_scrollbar_set_rect(demo.vscrollbar, &rect);
+
+        ui_scrollbar_set_thumb_length(demo.vscrollbar,
+            ui_scrollbar_through_length(demo.vscrollbar) / 4);
+
+        rc = ui_fixed_add(demo.fixed, ui_scrollbar_ctl(demo.vscrollbar));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");