hideo-about: Made skiftOS woke and based pilled

skift-org · Mar 12, 2024 · 6912873 · 6912873
1 parent 922b9ae
commit 6912873
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/src/apps/hideo-about/main.cpp b/src/apps/hideo-about/main.cpp
@@ -19,19 +19,19 @@ Ui::Child app() {
                 "The skiftOS Developers\n"
                 "All rights reserved.");
 
+            auto transflagText = Ui::hflow(
+                6,
+                Ui::image(Media::loadImage("bundle://hideo-about/pride.qoi"_url).unwrap(), 4),
+                Ui::bodySmall("Trans Rights are Human Rights"));
+
             auto licenseBtn = Ui::button(
                 [](auto &n) {
                     Ui::showDialog(n, Ui::licenseDialog());
                 },
-                Ui::ButtonStyle::subtle(),
+                Ui::ButtonStyle::outline(),
                 Mdi::LICENSE,
                 "License");
 
-            auto closeBtn = Ui::button(
-                Ui::bindBubble<Events::RequestExitEvent>(),
-                Ui::ButtonStyle::primary(),
-                "Close");
-
             return Ui::vflow(
                        8,
                        Ui::hflow(
@@ -43,9 +43,8 @@ Ui::Child app() {
                        Ui::grow(NONE),
                        Ui::hflow(
                            8,
-                           licenseBtn,
-                           Ui::grow(NONE),
-                           closeBtn)) |
+                           transflagText | Ui::vcenter() | Ui::grow(),
+                           licenseBtn)) |
                    Ui::spacing(16);
         },
         .size = {460, 320},

diff --git a/src/apps/hideo-about/res/pride.qoi b/src/apps/hideo-about/res/pride.qoi
diff --git a/src/libs/karm-base/vec.h b/src/libs/karm-base/vec.h
@@ -138,16 +138,14 @@ struct _Vec {
     constexpr T const *buf() const { return _buf.buf(); }
 
     constexpr T &operator[](usize i) {
-        if (i >= len()) {
+        if (i >= len())
             panic("index out of bounds");
-        }
         return _buf[i];
     }
 
     constexpr T const &operator[](usize i) const {
-        if (i >= len()) {
+        if (i >= len())
             panic("index out of bounds");
-        }
         return _buf[i];
     }
 };

diff --git a/src/libs/karm-ui/view.cpp b/src/libs/karm-ui/view.cpp
@@ -329,6 +329,7 @@ struct Image : public View<Image> {
         : _image(image), _radius(radius) {}
 
     void paint(Gfx::Context &g, Math::Recti) override {
+        g.save();
         if (_radius) {
             g.fillStyle(_image);
             g.fill(bound(), *_radius);
@@ -338,6 +339,7 @@ struct Image : public View<Image> {
 
         if (debugShowLayoutBounds)
             g.plot(bound(), Gfx::CYAN);
+        g.restore();
     }
 
     Math::Vec2i size(Math::Vec2i, Layout::Hint) override {