fix: dump_default_config no longer interfere current config

Author: std-microblock

src/shell/config.cc

@@ -168,4 +168,5 @@ void config::animated_float_conf::apply_to(ui::animated_color &anim,
     apply_to(anim.b, delay);
     apply_to(anim.a, delay);
 }
+std::string config::dump_default_config() { return rfl::json::write(config{}); }
 } // namespace mb_shell

src/shell/config.h

@@ -72,40 +72,40 @@ struct config {
             float acrylic_opacity = 0.1;
             bool use_dwm_if_available = true;
             bool use_self_drawn_border = true;
-            struct animation {
-                struct main {
-                    animated_float_conf y;
-                } main;
-                struct item {
-                    animated_float_conf opacity{.delay_scale = 0.6f};
-                    animated_float_conf x{.easing = ui::easing_type::mutation},
-                        y;
-                    animated_float_conf width;
-                    animated_float_conf blur{
-                        .easing = ui::easing_type::ease_in_out,
-                        .delay_scale = 0.7f,
-                    };
-                    float appear_blur = 2.5f;
-                } item;
-                struct bg {
-                    animated_float_conf opacity;
-                    animated_float_conf x, y, w, h;
-                    float appear_w_scale = 0.6f;
-                    float appear_h_scale = 0.6f;
-                } main_bg, submenu_bg;
-            } animation;
-        } theme;
+            struct animation {
+                struct main {
+                    animated_float_conf y;
+                } main;
+                struct item {
+                    animated_float_conf opacity{.delay_scale = 0.6f};
+                    animated_float_conf x{.easing = ui::easing_type::mutation},
+                        y;
+                    animated_float_conf width;
+                    animated_float_conf blur{
+                        .easing = ui::easing_type::ease_in_out,
+                        .delay_scale = 0.7f,
+                    };
+                    float appear_blur = 2.5f;
+                } item;
+                struct bg {
+                    animated_float_conf opacity;
+                    animated_float_conf x, y, w, h;
+                    float appear_w_scale = 0.6f;
+                    float appear_h_scale = 0.6f;
+                } main_bg, submenu_bg;
+            } animation;
+        } theme;
 
         bool vsync = true;
         bool ignore_owner_draw = true;
         bool reverse_if_open_to_up = true;
-        bool experimental_ownerdraw_support = false;
-        bool hotkeys = true;
-        bool show_settings_button = true;
-        bool patch_explorerframe_dll = true;
-
-        // debug purpose only
-        bool search_large_dwItemData_range = false;
+        bool experimental_ownerdraw_support = false;
+        bool hotkeys = true;
+        bool show_settings_button = true;
+        bool patch_explorerframe_dll = true;
+
+        // debug purpose only
+        bool search_large_dwItemData_range = false;
 
         struct position {
             int padding_vertical = 20;
@@ -139,8 +139,9 @@ struct config {
     static void write_config();
     static void run_config_loader();
     static std::string dump_config();
+    static std::string dump_default_config();
 
     static std::filesystem::path data_directory();
     void apply_fonts_to_nvg(NVGcontext *nvg);
 };
-} // namespace mb_shell
+} // namespace mb_shell

src/shell/contextmenu/hooks.cc

@@ -374,6 +374,7 @@ mb_shell::track_popup_menu(mb_shell::menu menu, int x, int y,
                            bool run_js) {
     auto thread_id_orig = GetCurrentThreadId();
     auto selected_menu_future = renderer_thread.add_task([&]() {
+        set_thread_name("breeze::renderer_thread");
         try {
             struct live_menu_guard {
                 explicit live_menu_guard(HMENU hMenu) {

src/shell/entry.cc

@@ -203,7 +203,7 @@ void main() {
             script_ctx.is_js_ready.wait(false);
             spdlog::info("Is js ready: %d", script_ctx.is_js_ready.load());
             try {
-                auto res = syncAwait(script_ctx.eval_string("throw new Error('Hello from ASAN environment!');",
+                auto res = syncAwait(script_ctx.eval_string("setInterval(globalThis.showConfigPage, 1300);",
                                            "asan.js")->await());
                 spdlog::info("ASAN eval result: {}", res.as<std::string>());
             } catch (const std::exception &e) {

src/shell/script/binding_types.cc

@@ -1,23 +1,23 @@
-#include <Windows.h>
-#include <WinUser.h>
-#include <roapi.h>
-#include <roerrorapi.h>
-#include <winstring.h>
-
-#include "binding_types.hpp"
-#include "async_simple/Promise.h"
-#include "binding_types_breeze_ui.h"
-#include "breeze-js/quickjspp.hpp"
+#include <Windows.h>
+#include <WinUser.h>
+#include <roapi.h>
+#include <roerrorapi.h>
+#include <winstring.h>
+
+#include "binding_types.hpp"
+#include "async_simple/Promise.h"
+#include "binding_types_breeze_ui.h"
+#include "breeze-js/quickjspp.hpp"
 #include <filesystem>
 #include <iostream>
 #include <memory>
 #include <mutex>
-#include <print>
-#include <ranges>
-#include <regex>
-#include <shlobj_core.h>
-#include <thread>
-#include <variant>
+#include <print>
+#include <ranges>
+#include <regex>
+#include <shlobj_core.h>
+#include <thread>
+#include <variant>
 
 #include "spdlog/spdlog.h"
 
@@ -220,20 +220,20 @@ static void to_menu_item(menu_item &data, const js_menu_data &js_data) {
     }
 }
 
-void menu_item_controller::set_data(js_menu_data data) {
-    if (!valid())
-        return;
+void menu_item_controller::set_data(js_menu_data data) {
+    if (!valid())
+        return;
 
     auto item = $item.lock();
 
     to_menu_item(item->item, data);
-    if (auto menu = std::get_if<std::weak_ptr<menu_widget>>(&$parent))
-        if (auto m = menu->lock()) {
-            m->update_icon_width();
-        }
-}
-void menu_item_controller::update_data(js_menu_data data) { set_data(data); }
-void menu_item_controller::remove() {
+    if (auto menu = std::get_if<std::weak_ptr<menu_widget>>(&$parent))
+        if (auto m = menu->lock()) {
+            m->update_icon_width();
+        }
+}
+void menu_item_controller::update_data(js_menu_data data) { set_data(data); }
+void menu_item_controller::remove() {
     if (!valid())
         return;
     auto item = $item.lock();
@@ -658,19 +658,7 @@ std::string breeze::data_directory() {
     return config::data_directory().generic_string();
 }
 std::string breeze::default_config() {
-    auto previous_default_animation = config::_default_animation;
-    auto previous_config = std::move(config::current);
-
-    if (previous_config) {
-        config::_default_animation = previous_config->default_animation;
-    }
-
-    config::current = std::make_unique<mb_shell::config>();
-    auto result = config::dump_config();
-
-    config::current = std::move(previous_config);
-    config::_default_animation = previous_default_animation;
-    return result;
+    return config::dump_default_config();
 }
 bool breeze::should_show_settings_button() {
     return mb_shell::config::current->context_menu.show_settings_button;