fix: make openBrowser inline, added dev shortcut

Ctrl+Shift+Left click for skip login Ctrl+Shift+Right click for fake login (not trigger onLogin)
NJUPT-SAST · Aug 21, 2024 · cca10d3 · cca10d3
1 parent e51580f
commit cca10d3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/src/Controller/Core/AccountManager.cc b/src/Controller/Core/AccountManager.cc
@@ -76,6 +76,10 @@ void AccountManager::requestLogin() {
 
 void AccountManager::requestLogout() {
     // TODO: net logout
+    auto& self = *this;
+    // if (logoutSuccess) {
+    self->set_is_login(false);
+    // }
 }
 
 UserInfoEntity AccountManager::getUserInfo() {

diff --git a/src/Controller/View/MenuOverlay.cc b/src/Controller/View/MenuOverlay.cc
@@ -15,7 +15,7 @@ MenuOverlay::MenuOverlay(slint::ComponentHandle<UiEntryName> uiEntry, UiBridge&
 
 void MenuOverlay::onCreate() {
     auto& self = *this;
-    self->on_open_link_web([this] { openBrowser("https://link.sast.fun/home"); });
+    self->on_open_link_web([] { openBrowser("https://link.sast.fun/home"); });
 }
 
 void MenuOverlay::onShow() {

diff --git a/src/Controller/View/MenuOverlay.h b/src/Controller/View/MenuOverlay.h
@@ -15,8 +15,6 @@ class MenuOverlay : public BasicView, private GlobalAgent<MenuOverlayBridge> {
     void onCreate() override;
     void onShow() override;
     void onLogin() override;
-
-    void openLinkWeb();
 };
 
 EVENTO_UI_END
diff --git a/src/Infrastructure/Utils/Tools.h b/src/Infrastructure/Utils/Tools.h
@@ -7,7 +7,7 @@ namespace evento {
 
 namespace urls = boost::urls;
 
-void openBrowser(urls::url_view url) {
+inline void openBrowser(urls::url_view url) {
     using namespace std::string_literals;
     std::string url_str = "\""s + url.data() + "\"";
 #ifdef __linux__

diff --git a/ui/logic/account_manager.slint b/ui/logic/account_manager.slint
@@ -5,7 +5,7 @@ export global AccountManagerBridge {
 }
 
 export global AccountManager {
-    out property <bool> is-login <=> AccountManagerBridge.is-login;
+    out property <bool> is-login: AccountManagerBridge.is-login;
     public function request-login() {
         AccountManagerBridge.request-login();
     }

diff --git a/ui/views/overlay/login.slint b/ui/views/overlay/login.slint
@@ -223,10 +223,16 @@ export component LoginOverlay inherits Overlay {
             }
             pointer-event(e) => {
                 // developer shortcut
-                if (e.modifiers.shift && e.modifiers.control && e.button == PointerEventButton.right && e.kind == PointerEventKind.up) {
-                    debug("Warning: you are using developer shortcut, skip LoginView");
-                    AccountManagerBridge.is-login = true;
-                    ViewManager.prior-view();
+                if (e.modifiers.shift && e.modifiers.control && e.kind == PointerEventKind.up) {
+                    if (e.button == PointerEventButton.left) {
+                        debug("[Developer Shortcut] LoginOverlay: force close LoginView");
+                        ViewManager.prior-view();
+                    } else if (e.button == PointerEventButton.right) {
+                        debug("[Developer Shortcut] LoginOverlay: fake login, skip LoginView");
+                        AccountManagerBridge.is-login = true;
+                        debug("[Developer Shortcut] LoginOverlay: AccountManagerBridge.is-login -> true");
+                        ViewManager.prior-view();
+                    }
                 }
             }
         }

diff --git a/ui/views/overlay/menu.slint b/ui/views/overlay/menu.slint
@@ -210,6 +210,7 @@ export component MenuOverlay inherits Overlay {
                 label-color: ROOT-STYLES.sur-theme-colors.error.normal;
                 clicked => {
                     AccountManager.request-logout();
+                    ViewManager.clean-navigate-to(ViewName.LoginOverlay);
                 }
             }
         }