refactored foreground message window

GChristensen · Jun 23, 2024 · cbca7bb · cbca7bb
1 parent e2c2223
commit cbca7bb
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 68 deletions.
diff --git a/enso/enso/platform/win32/AsyncEventProcessorRegistry.dll b/enso/enso/platform/win32/AsyncEventProcessorRegistry.dll
diff --git a/enso/enso/platform/win32/CLogging.dll b/enso/enso/platform/win32/CLogging.dll
diff --git a/enso/enso/platform/win32/Keyhook.dll b/enso/enso/platform/win32/Keyhook.dll
diff --git a/enso/enso/platform/win32/cairo/_cairo.pyd b/enso/enso/platform/win32/cairo/_cairo.pyd
diff --git a/enso/enso/platform/win32/graphics/TransparentWindow.py b/enso/enso/platform/win32/graphics/TransparentWindow.py
@@ -1,19 +1,23 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
 # Version 4.0.2
 #
-# !!! This file is edited
-#
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
-from .utils import setForegroundWindow
+
+from sys import version_info as _swig_python_version_info
+if _swig_python_version_info < (2, 7, 0):
+    raise RuntimeError("Python 2.7 or later required")
 
 # Import the low-level C/C++ module
 if __package__ or "." in __name__:
     from . import _TransparentWindow
 else:
     import _TransparentWindow
 
-import builtins as __builtin__
+try:
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
 
 def _swig_repr(self):
     try:
@@ -137,15 +141,14 @@ def getMaxWidth(self):
     def getMaxHeight(self):
         return _TransparentWindow.TransparentWindow_getMaxHeight(self)
 
-    def makeCairoSurface(self):
-        return _TransparentWindow.TransparentWindow_makeCairoSurface(self)
-
     def getHandle(self):
         return _TransparentWindow.TransparentWindow_getHandle(self)
 
     def setForeground(self):
-        handle = self.getHandle()
-        setForegroundWindow(handle)
+        return _TransparentWindow.TransparentWindow_setForeground(self)
+
+    def makeCairoSurface(self):
+        return _TransparentWindow.TransparentWindow_makeCairoSurface(self)
 
 # Register TransparentWindow in _TransparentWindow:
 _TransparentWindow.TransparentWindow_swigregister(TransparentWindow)
@@ -155,4 +158,6 @@ def _getDesktopSize():
     return _TransparentWindow._getDesktopSize()
 
 def _getDesktopOffset():
-    return _TransparentWindow._getDesktopOffset()
+    return _TransparentWindow._getDesktopOffset()
+
+
diff --git a/enso/enso/platform/win32/graphics/_TransparentWindow.pyd b/enso/enso/platform/win32/graphics/_TransparentWindow.pyd
diff --git a/enso/enso/platform/win32/graphics/utils.py b/enso/enso/platform/win32/graphics/utils.py
diff --git a/enso/enso/platform/win32/input/_AsyncEventThread.pyd b/enso/enso/platform/win32/input/_AsyncEventThread.pyd
diff --git a/enso/enso/platform/win32/input/_InputManager.pyd b/enso/enso/platform/win32/input/_InputManager.pyd
diff --git a/enso/enso/platform/win32/selection/_ClipboardBackend.pyd b/enso/enso/platform/win32/selection/_ClipboardBackend.pyd
diff --git a/platform/win32/Graphics/TransparentWindow/TransparentWindow.cxx b/platform/win32/Graphics/TransparentWindow/TransparentWindow.cxx
@@ -651,4 +651,22 @@ _getDesktopOffset( int *left,
 
 long long TransparentWindow::getHandle() {
     return (long long)_window;
-}
+}
+
+void TransparentWindow::setForeground() {
+    DWORD dwCurrentThread = GetCurrentThreadId();
+    HWND dwFGWindow = GetForegroundWindow();
+    DWORD dwFGThread = GetWindowThreadProcessId(dwFGWindow, NULL);
+
+    AttachThreadInput(dwCurrentThread, dwFGThread, TRUE);
+
+    SetWindowPos(_window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+    SetWindowPos(_window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+    SetWindowPos(_window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
+
+    SetForegroundWindow(_window);
+    SetFocus(_window);
+    SetActiveWindow(_window);
+
+    AttachThreadInput(dwCurrentThread, dwFGThread, FALSE);
+}
diff --git a/platform/win32/Graphics/TransparentWindow/TransparentWindow.h b/platform/win32/Graphics/TransparentWindow/TransparentWindow.h
@@ -302,6 +302,7 @@ class TransparentWindow
     getMaxHeight( void );
 
     long long getHandle();
+    void setForeground();
 
 #ifndef SWIG
 private: