fix: focus window on show

Author: std-microblock

src/shell/contextmenu/hooks.cc

@@ -116,47 +116,45 @@ void mb_shell::context_menu_hooks::install_SHCreateDefaultContextMenu_hook() {
     std::cerr << "Failed to find CreateWindowExW in user32.dll" << std::endl;
   }
   static auto CreateWindowExWHook = CreateWindowExWFunc->inline_hook();
-  CreateWindowExWHook->install(+[](DWORD dwExStyle, LPCWSTR lpClassName,
-                                   LPCWSTR lpWindowName, DWORD dwStyle, int X,
-                                   int Y, int nWidth, int nHeight,
-                                   HWND hWndParent, HMENU hMenu,
-                                   HINSTANCE hInstance,
-                                   LPVOID lpParam) -> HWND {
-    std::wstring class_name = [&]{
-        if (!lpClassName) {
+  CreateWindowExWHook->install(
+      +[](DWORD dwExStyle, LPCWSTR lpClassName, LPCWSTR lpWindowName,
+          DWORD dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent,
+          HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam) -> HWND {
+        std::wstring class_name = [&] {
+          if (!lpClassName) {
             return std::wstring(L"");
-        }
-        if (blook::Pointer((void*)lpClassName).try_read<int>()) {
+          }
+          if (blook::Pointer((void *)lpClassName).try_read<int>()) {
             return std::wstring(lpClassName);
-        } else {
+          } else {
             // read as registered class
             wchar_t class_name_buffer[256];
             if (GetClassNameW((HWND)lpClassName, class_name_buffer, 256) > 0) {
-                return std::wstring(class_name_buffer);
+              return std::wstring(class_name_buffer);
             } else {
-                return std::wstring(L"");
+              return std::wstring(L"");
             }
-        }
-    }();
+          }
+        }();
 
-    bool should_close =
-        close_next_create_window_exw_window &&
-        class_name.starts_with(L"HwndWrapper[OneCommander.exe");
+        bool should_close =
+            close_next_create_window_exw_window &&
+            class_name.starts_with(L"HwndWrapper[OneCommander.exe");
 
-    if (should_close) {
-      dwStyle &= ~WS_VISIBLE;
-    }
+        if (should_close) {
+          dwStyle &= ~WS_VISIBLE;
+        }
 
-    auto res = CreateWindowExWHook->call_trampoline<HWND>(
-        dwExStyle, lpClassName, lpWindowName, dwStyle, X, Y, nWidth, nHeight,
-        hWndParent, hMenu, hInstance, lpParam);
-    if (res && should_close) {
-      close_next_create_window_exw_window = false;
-      PostMessageW(res, WM_CLOSE, 0, 0);
-      CloseWindow(res);
-    }
-    return res;
-  });
+        auto res = CreateWindowExWHook->call_trampoline<HWND>(
+            dwExStyle, lpClassName, lpWindowName, dwStyle, X, Y, nWidth,
+            nHeight, hWndParent, hMenu, hInstance, lpParam);
+        if (res && should_close) {
+          close_next_create_window_exw_window = false;
+          PostMessageW(res, WM_CLOSE, 0, 0);
+          CloseWindow(res);
+        }
+        return res;
+      });
 
   /**
    prototype: SHSTDAPI SHCreateDefaultContextMenu(

src/shell/contextmenu/menu_render.cc

@@ -1,4 +1,6 @@
 #include "menu_render.h"
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include "GLFW/glfw3native.h"
 #include "Windows.h"
 #include "menu_widget.h"
 
@@ -18,14 +20,14 @@ menu_render menu_render::create(int x, int y, menu menu) {
     return {nullptr, std::nullopt};
   }
 
-  constexpr int l_pad = 100, t_pad = -1;
+  constexpr int l_pad = -1, t_pad = -1;
   static auto rt = []() {
     auto rt = std::make_shared<ui::render_target>();
     rt->transparent = true;
     rt->no_focus = false;
     rt->capture_all_input = true;
     rt->decorated = false;
-    // rt->topmost = true;
+    rt->topmost = true;
     rt->vsync = config::current->context_menu.vsync;
 
     if (config::current->avoid_resize_ui) {
@@ -74,6 +76,7 @@ menu_render menu_render::create(int x, int y, menu menu) {
   glfwSwapInterval(config::current->context_menu.vsync ? 1 : 0);
 
   rt->show();
+  rt->focus();
   auto menu_wid = std::make_shared<mouse_menu_widget_main>(
       menu,
       // convert the x and y to the window coordinates

src/shell/entry.cc

@@ -109,7 +109,7 @@ void main() {
   std::filesystem::path exe_path(executable_path);
 
   fix_win11_menu::install();
-  
+
   context_menu_hooks::install_common_hook();
   if (exe_path.filename() == "OneCommander.exe") {
     context_menu_hooks::install_SHCreateDefaultContextMenu_hook();

src/ui/ui.cc

@@ -401,4 +401,11 @@ void render_target::post_loop_thread_task(std::function<void()> task) {
   std::lock_guard lock(loop_thread_tasks_lock);
   loop_thread_tasks.push(std::move(task));
 }
+void render_target::focus() {
+  if (this->window) {
+    glfwFocusWindow(this->window);
+    SetActiveWindow(glfwGetWin32Window(this->window));
+    SetFocus(glfwGetWin32Window(this->window));
+  }
+}
 } // namespace ui

src/ui/ui.h

@@ -120,6 +120,7 @@ struct render_target {
   void close();
   void hide();
   void show();
+  void focus();
   void hide_as_close();
   bool should_loop_stop_hide_as_close = false;
   std::optional<std::function<void(bool)>> on_focus_changed;