feat: support light color

Author: std-microblock

src/shell/contextmenu/menu_render.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "../utils.h"
 #include "shell.h"
 #include "ui.h"
 #include <optional>
@@ -7,6 +8,7 @@ namespace mb_shell {
 struct menu_render {
   std::unique_ptr<ui::render_target> rt;
   std::optional<int> selected_menu;
+  bool light_color = is_light_mode();
   enum class menu_style {
     fluentui,
     materialyou

src/shell/contextmenu/menu_widget.cc

@@ -11,13 +11,15 @@
 
 void mb_shell::menu_item_widget::render(ui::nanovg_context ctx) {
   super::render(ctx);
+
+  auto c = menu_render::current.value()->light_color ? 0 : 1;
   if (item.type == menu_item::type::spacer) {
-    ctx.fillColor(nvgRGBAf(1, 1, 1, 0.1));
+    ctx.fillColor(nvgRGBAf(c, c, c, 0.1));
     ctx.fillRect(x->dest(), *y, *width, *height);
     return;
   }
 
-  ctx.fillColor(nvgRGBAf(1, 1, 1, *bg_opacity / 255.f));
+  ctx.fillColor(nvgRGBAf(c, c, c, *bg_opacity / 255.f));
 
   float roundcorner = 4;
 
@@ -29,10 +31,6 @@ void mb_shell::menu_item_widget::render(ui::nanovg_context ctx) {
   ctx.fillRoundedRect(*x + margin, *y, *width - margin * 2, *height,
                       roundcorner);
 
-  ctx.fillColor(nvgRGBAf(1, 1, 1, *opacity / 255.f));
-  ctx.fontFace("Yahei");
-  ctx.fontSize(14);
-
   if (item.icon_bitmap.has_value()) {
     auto paintY = floor(*y + (*height - icon_width) / 2);
     if (!icon_img_bmp) {
@@ -50,6 +48,10 @@ void mb_shell::menu_item_widget::render(ui::nanovg_context ctx) {
     ctx.fill();
   }
 
+  ctx.fillColor(nvgRGBAf(c, c, c, *opacity / 255.f));
+  ctx.fontFace("Yahei");
+  ctx.fontSize(14);
+
   ctx.text(floor(*x + text_padding + icon_width + icon_padding * 2), *y + 16,
            item.name->c_str(), nullptr);
 
@@ -59,7 +61,7 @@ void mb_shell::menu_item_widget::render(ui::nanovg_context ctx) {
     ctx.moveTo(*x + *width - 20, *y + 8);
     ctx.lineTo(*x + *width - 15, *y + 12);
     ctx.lineTo(*x + *width - 20, *y + 16);
-    ctx.strokeColor(nvgRGBAf(1, 1, 1, *opacity * 0.6 / 255.f));
+    ctx.strokeColor(nvgRGBAf(c, c, c, *opacity * 0.6 / 255.f));
     ctx.strokeWidth(1);
     ctx.stroke();
   }
@@ -70,7 +72,7 @@ void mb_shell::menu_item_widget::render(ui::nanovg_context ctx) {
       ctx.moveTo(*x + icon_padding + margin + 2, *y + 4 + 8);
       ctx.lineTo(*x + icon_padding + margin + 6, *y + 8 + 8);
       ctx.lineTo(*x + icon_padding + margin + 14, *y + 0 + 8);
-      ctx.strokeColor(nvgRGBAf(1, 1, 1, *opacity * 0.6 / 255.f));
+      ctx.strokeColor(nvgRGBAf(c, c, c, *opacity * 0.6 / 255.f));
       ctx.strokeWidth(2);
       ctx.stroke();
     }
@@ -126,12 +128,11 @@ void mb_shell::menu_item_widget::update(ui::update_context &ctx) {
             submenu_wid.get(), ctx, anchor_x, anchor_y, direction);
 
         submenu_wid->direction = direction;
-        submenu_wid->have_overlap = ctx.rt.root->check_hit(ui::update_context{
-            .mouse_x = x / ctx.rt.dpi_scale,
-            .mouse_y = y / ctx.rt.dpi_scale,
-            .screen = ctx.screen,
-            .rt = ctx.rt
-        });
+        submenu_wid->have_overlap = ctx.rt.root->check_hit(
+            ui::update_context{.mouse_x = x / ctx.rt.dpi_scale,
+                               .mouse_y = y / ctx.rt.dpi_scale,
+                               .screen = ctx.screen,
+                               .rt = ctx.rt});
 
         submenu_wid->x->reset_to(x / ctx.rt.dpi_scale - ctx.offset_x);
         submenu_wid->y->reset_to(y / ctx.rt.dpi_scale - ctx.offset_y);
@@ -213,6 +214,11 @@ void mb_shell::menu_widget::update(ui::update_context &ctx) {
   ctx.hovered_hit(bg.get());
 }
 void mb_shell::menu_widget::render(ui::nanovg_context ctx) {
+  auto c = menu_render::current.value()->light_color ? 1 : 0;
+  ctx.fillColor(nvgRGBAf(c, c, c, 0.6));
+  ctx.fillRoundedRect(*x, *y - bg_padding_vertical, *width,
+                      *height + 2 * bg_padding_vertical, 6);
+
   std::lock_guard lock(data_lock);
   bg->render(ctx);
   super::render(ctx);

src/shell/utils.cc

@@ -39,4 +39,13 @@ bool mb_shell::is_win11_or_later() {
   RtlGetNtVersionNumbers(&major, &minor, &build);
   build &= 0xFFFF;
   return (major >= 10 && build >= 22000);
-}
+}
+bool mb_shell::is_light_mode() {
+  auto key = HKEY_CURRENT_USER;
+  auto subkey = L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+  auto value = L"AppsUseLightTheme";
+  DWORD data = 0;
+  DWORD size = sizeof(data);
+  auto res = RegGetValueW(key, subkey, value, RRF_RT_REG_DWORD, nullptr, &data, &size);
+  return res == ERROR_SUCCESS && data == 1;
+}

src/shell/utils.h

@@ -5,4 +5,5 @@ namespace mb_shell {
 std::string wstring_to_utf8(std::wstring const &str);
 std::wstring utf8_to_wstring(std::string const &str);
 bool is_win11_or_later();
+bool is_light_mode();
 } // namespace mb_shell