fix window size bug when maximized and return correct size and position.

hecomi · hecomi · commit 94f693401876 · 2019-02-07T01:33:54.000+09:00
diff --git a/Assets/uWindowCapture/Editor/UwcWindowTextureEditor.cs b/Assets/uWindowCapture/Editor/UwcWindowTextureEditor.cs
@@ -181,8 +181,6 @@ void DrawWindowInformation()
         EditorGUILayout.IntField("Window Width", window.width);
         EditorGUILayout.IntField("Window Height", window.height);
         EditorGUILayout.IntField("Window Z-Order", window.zOrder);
-        EditorGUILayout.IntField("Buffer Width", window.bufferWidth);
-        EditorGUILayout.IntField("Buffer Height", window.bufferHeight);
         EditorGUILayout.Toggle("Alt-Tab Window", window.isAltTabWindow);
         EditorGUILayout.Toggle("Minimized", window.isMinimized);
         EditorGUILayout.Toggle("Maximized", window.isMaximized);
diff --git a/Assets/uWindowCapture/Examples/GetPixels/UwcGetPixelsExample.cs b/Assets/uWindowCapture/Examples/GetPixels/UwcGetPixelsExample.cs
@@ -35,7 +35,7 @@ void Update()
         CreateTextureIfNeeded();
 
         var window = uwcTexture.window;
-        if (window == null || window.bufferWidth == 0) return;
+        if (window == null || window.width == 0) return;
 
         // GetPixels() can be run in another thread
         if (window.GetPixels(colors, x, y, w, h)) {
diff --git a/Assets/uWindowCapture/Examples/Window List/UwcWindowListItem.cs b/Assets/uWindowCapture/Examples/Window List/UwcWindowListItem.cs
@@ -43,8 +43,8 @@ void Update()
         var windowTitle = window.title;
         title.text = string.IsNullOrEmpty(windowTitle) ? "-No Name-" : windowTitle;
 
-        x.text = window.x.ToString();
-        y.text = window.y.ToString();
+        x.text = window.isMinimized ? "-" : window.x.ToString();
+        y.text = window.isMinimized ? "-" : window.y.ToString();
         z.text = window.zOrder.ToString();
 
         width.text = window.width.ToString();
diff --git a/Assets/uWindowCapture/Plugins/x86/uWindowCapture.dll b/Assets/uWindowCapture/Plugins/x86/uWindowCapture.dll
diff --git a/Assets/uWindowCapture/Plugins/x86_64/uWindowCapture.dll b/Assets/uWindowCapture/Plugins/x86_64/uWindowCapture.dll
diff --git a/Assets/uWindowCapture/Scripts/UwcLib.cs b/Assets/uWindowCapture/Scripts/UwcLib.cs
@@ -123,10 +123,14 @@ public static class Lib
     public static extern int GetWindowZOrder(int id);
     [DllImport(name, EntryPoint = "UwcGetWindowBuffer")]
     public static extern IntPtr GetWindowBuffer(int id);
-    [DllImport(name, EntryPoint = "UwcGetWindowBufferWidth")]
-    public static extern int GetWindowBufferWidth(int id);
-    [DllImport(name, EntryPoint = "UwcGetWindowBufferHeight")]
-    public static extern int GetWindowBufferHeight(int id);
+    [DllImport(name, EntryPoint = "UwcGetWindowTextureWidth")]
+    public static extern int GetWindowTextureWidth(int id);
+    [DllImport(name, EntryPoint = "UwcGetWindowTextureHeight")]
+    public static extern int GetWindowTextureHeight(int id);
+    [DllImport(name, EntryPoint = "UwcGetWindowTextureOffsetX")]
+    public static extern int GetWindowTextureOffsetX(int id);
+    [DllImport(name, EntryPoint = "UwcGetWindowTextureOffsetY")]
+    public static extern int GetWindowTextureOffsetY(int id);
     [DllImport(name, EntryPoint = "UwcGetWindowIconWidth")]
     public static extern int GetWindowIconWidth(int id);
     [DllImport(name, EntryPoint = "UwcGetWindowIconHeight")]
diff --git a/Assets/uWindowCapture/Scripts/UwcWindow.cs b/Assets/uWindowCapture/Scripts/UwcWindow.cs
@@ -161,26 +161,46 @@ public string className
         get { return Lib.GetWindowClassName(id); } 
     }
 
-    public int x
+    public int rawX
     {
         get { return Lib.GetWindowX(id); }
     }
 
-    public int y
+    public int rawY
     {
         get { return Lib.GetWindowY(id); }
     }
 
-    public int width
+    public int rawWidth
     {
         get { return Lib.GetWindowWidth(id); }
     }
 
-    public int height
+    public int rawHeight
     {
         get { return Lib.GetWindowHeight(id); }
     }
 
+    public int x
+    {
+        get { return rawX + Lib.GetWindowTextureOffsetX(id); }
+    }
+
+    public int y
+    {
+        get { return rawY + Lib.GetWindowTextureOffsetY(id); }
+    }
+
+    public int width
+    {
+        get { return Lib.GetWindowTextureWidth(id); }
+    }
+
+    public int height
+    {
+        get { return Lib.GetWindowTextureHeight(id); }
+    }
+
     public int zOrder
     {
         get { return Lib.GetWindowZOrder(id); }
@@ -191,14 +211,14 @@ public System.IntPtr buffer
         get { return Lib.GetWindowBuffer(id); }
     }
 
-    public int bufferWidth
+    public int textureOffsetX
     {
-        get { return Lib.GetWindowBufferWidth(id); }
+        get { return Lib.GetWindowTextureOffsetX(id); }
     }
 
-    public int bufferHeight
+    public int textureOffsetY
     {
-        get { return Lib.GetWindowBufferHeight(id); }
+        get { return Lib.GetWindowTextureOffsetY(id); }
     }
 
     public int iconWidth
@@ -317,8 +337,8 @@ void OnIconCaptured()
 
     void CreateWindowTexture()
     {
-        var w = bufferWidth;
-        var h = bufferHeight;
+        var w = width;
+        var h = height;
         if (w == 0 || h == 0) return;
 
         if (!texture || texture.width != w || texture.height != h) {
diff --git a/Plugins/uWindowCapture/uWindowCapture/Main.cpp b/Plugins/uWindowCapture/uWindowCapture/Main.cpp
@@ -291,20 +291,38 @@ extern "C"
         return nullptr;
     }
 
-    UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowBufferWidth(int id)
+    UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureWidth(int id)
     {
         if (auto window = GetWindow(id))
         {
-            return window->GetBufferWidth();
+            return window->GetTextureWidth();
         }
         return 0;
     }
 
-    UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowBufferHeight(int id)
+    UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureHeight(int id)
     {
         if (auto window = GetWindow(id))
         {
-            return window->GetBufferHeight();
+            return window->GetTextureHeight();
+        }
+        return 0;
+    }
+
+    UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureOffsetX(int id)
+    {
+        if (auto window = GetWindow(id))
+        {
+            return window->GetTextureOffsetX();
+        }
+        return 0;
+    }
+
+    UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureOffsetY(int id)
+    {
+        if (auto window = GetWindow(id))
+        {
+            return window->GetTextureOffsetY();
         }
         return 0;
     }
diff --git a/Plugins/uWindowCapture/uWindowCapture/Window.cpp b/Plugins/uWindowCapture/uWindowCapture/Window.cpp
@@ -205,18 +205,30 @@ BYTE* Window::GetBuffer() const
 }
 
 
-UINT Window::GetBufferWidth() const
+UINT Window::GetTextureWidth() const
 {
     return windowTexture_->GetWidth();
 }
 
 
-UINT Window::GetBufferHeight() const
+UINT Window::GetTextureHeight() const
 {
     return windowTexture_->GetHeight();
 }
 
 
+UINT Window::GetTextureOffsetX() const
+{
+    return windowTexture_->GetOffsetX();
+}
+
+
+UINT Window::GetTextureOffsetY() const
+{
+    return windowTexture_->GetOffsetY();
+}
+
+
 UINT Window::GetIconWidth() const
 {
     return iconTexture_->GetWidth();
diff --git a/Plugins/uWindowCapture/uWindowCapture/Window.h b/Plugins/uWindowCapture/uWindowCapture/Window.h
@@ -64,8 +64,10 @@ friend class WindowManager;
     UINT GetClientHeight() const;
     UINT GetZOrder() const;
     BYTE* GetBuffer() const;
-    UINT GetBufferWidth() const;
-    UINT GetBufferHeight() const;
+    UINT GetTextureWidth() const;
+    UINT GetTextureHeight() const;
+    UINT GetTextureOffsetX() const;
+    UINT GetTextureOffsetY() const;
     UINT GetIconWidth() const;
     UINT GetIconHeight() const;
 
diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowTexture.cpp b/Plugins/uWindowCapture/uWindowCapture/WindowTexture.cpp
@@ -73,6 +73,18 @@ UINT WindowTexture::GetHeight() const
 }
 
 
+UINT WindowTexture::GetOffsetX() const
+{
+    return offsetX_;
+}
+
+
+UINT WindowTexture::GetOffsetY() const
+{
+    return offsetY_;
+}
+
+
 void WindowTexture::CreateBitmapIfNeeded(HDC hDc, UINT width, UINT height)
 {
     std::lock_guard<std::mutex> lock(bufferMutex_);
@@ -151,16 +163,27 @@ bool WindowTexture::Capture()
         // Remove dropshadow area
         if (captureMode_ == CaptureMode::PrintWindow)
         {
-            RECT dwmRect;
-            ::DwmGetWindowAttribute(hWnd, DWMWA_EXTENDED_FRAME_BOUNDS, &dwmRect, sizeof(RECT));
-
             RECT windowRect;
             ::GetWindowRect(hWnd, &windowRect);
 
+            RECT dwmRect;
+            ::DwmGetWindowAttribute(hWnd, DWMWA_EXTENDED_FRAME_BOUNDS, &dwmRect, sizeof(RECT));
+
             offsetX_ = max(dwmRect.left - windowRect.left, 0);
             offsetY_ = max(dwmRect.top - windowRect.top, 0);
             textureWidth_ = static_cast<UINT>((dwmRect.right - dwmRect.left) / dpiScaleX);
             textureHeight_ = static_cast<UINT>((dwmRect.bottom - dwmRect.top) / dpiScaleY);
+
+            if (::IsZoomed(hWnd))
+            {
+                auto hMonitor = ::MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+                MONITORINFO monitor = { sizeof(MONITORINFO) };
+                ::GetMonitorInfo(hMonitor, &monitor);
+                offsetX_ = monitor.rcMonitor.left - windowRect.left;
+                offsetY_ = monitor.rcMonitor.top - windowRect.top;
+                textureWidth_ -= 2 * offsetX_;
+                textureHeight_ -= 2 * offsetY_;
+            }
         }
         else
         {
diff --git a/Plugins/uWindowCapture/uWindowCapture/WindowTexture.h b/Plugins/uWindowCapture/uWindowCapture/WindowTexture.h
@@ -37,6 +37,8 @@ class WindowTexture
 
     UINT GetWidth() const;
     UINT GetHeight() const;
+    UINT GetOffsetX() const;
+    UINT GetOffsetY() const;
 
     bool Capture();
     bool Upload();

Original file line number	Diff line number	Diff line change
`@@ -161,26 +161,46 @@ public string className`
`161`	`161`	`get { return Lib.GetWindowClassName(id); }`
`162`	`162`	`}`
`163`	`163`
`164`		`- public int x`
	`164`	`+ public int rawX`
`165`	`165`	`{`
`166`	`166`	`get { return Lib.GetWindowX(id); }`
`167`	`167`	`}`
`168`	`168`
`169`		`- public int y`
	`169`	`+ public int rawY`
`170`	`170`	`{`
`171`	`171`	`get { return Lib.GetWindowY(id); }`
`172`	`172`	`}`
`173`	`173`
`174`		`- public int width`
	`174`	`+ public int rawWidth`
`175`	`175`	`{`
`176`	`176`	`get { return Lib.GetWindowWidth(id); }`
`177`	`177`	`}`
`178`	`178`
`179`		`- public int height`
	`179`	`+ public int rawHeight`
`180`	`180`	`{`
`181`	`181`	`get { return Lib.GetWindowHeight(id); }`
`182`	`182`	`}`
`183`	`183`
	`184`	`+ public int x`
	`185`	`+ {`
	`186`	`+ get { return rawX + Lib.GetWindowTextureOffsetX(id); }`
	`187`	`+ }`
	`188`	`+`
	`189`	`+ public int y`
	`190`	`+ {`
	`191`	`+ get { return rawY + Lib.GetWindowTextureOffsetY(id); }`
	`192`	`+ }`
	`193`	`+`
	`194`	`+ public int width`
	`195`	`+ {`
	`196`	`+ get { return Lib.GetWindowTextureWidth(id); }`
	`197`	`+ }`
	`198`	`+`
	`199`	`+ public int height`
	`200`	`+ {`
	`201`	`+ get { return Lib.GetWindowTextureHeight(id); }`
	`202`	`+ }`
	`203`	`+`
`184`	`204`	`public int zOrder`
`185`	`205`	`{`
`186`	`206`	`get { return Lib.GetWindowZOrder(id); }`
`@@ -191,14 +211,14 @@ public System.IntPtr buffer`
`191`	`211`	`get { return Lib.GetWindowBuffer(id); }`
`192`	`212`	`}`
`193`	`213`
`194`		`- public int bufferWidth`
	`214`	`+ public int textureOffsetX`
`195`	`215`	`{`
`196`		`- get { return Lib.GetWindowBufferWidth(id); }`
	`216`	`+ get { return Lib.GetWindowTextureOffsetX(id); }`
`197`	`217`	`}`
`198`	`218`
`199`		`- public int bufferHeight`
	`219`	`+ public int textureOffsetY`
`200`	`220`	`{`
`201`		`- get { return Lib.GetWindowBufferHeight(id); }`
	`221`	`+ get { return Lib.GetWindowTextureOffsetY(id); }`
`202`	`222`	`}`
`203`	`223`
`204`	`224`	`public int iconWidth`
`@@ -317,8 +337,8 @@ void OnIconCaptured()`
`317`	`337`
`318`	`338`	`void CreateWindowTexture()`
`319`	`339`	`{`
`320`		`- var w = bufferWidth;`
`321`		`- var h = bufferHeight;`
	`340`	`+ var w = width;`
	`341`	`+ var h = height;`
`322`	`342`	`if (w == 0 \|\| h == 0) return;`
`323`	`343`
`324`	`344`	`if (!texture \|\| texture.width != w \|\| texture.height != h) {`
Original file line number	Diff line number	Diff line change
`@@ -291,20 +291,38 @@ extern "C"`
`291`	`291`	`return nullptr;`
`292`	`292`	`}`
`293`	`293`
`294`		`- UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowBufferWidth(int id)`
	`294`	`+ UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureWidth(int id)`
`295`	`295`	`{`
`296`	`296`	`if (auto window = GetWindow(id))`
`297`	`297`	`{`
`298`		`- return window->GetBufferWidth();`
	`298`	`+ return window->GetTextureWidth();`
`299`	`299`	`}`
`300`	`300`	`return 0;`
`301`	`301`	`}`
`302`	`302`
`303`		`- UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowBufferHeight(int id)`
	`303`	`+ UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureHeight(int id)`
`304`	`304`	`{`
`305`	`305`	`if (auto window = GetWindow(id))`
`306`	`306`	`{`
`307`		`- return window->GetBufferHeight();`
	`307`	`+ return window->GetTextureHeight();`
	`308`	`+ }`
	`309`	`+ return 0;`
	`310`	`+ }`
	`311`	`+`
	`312`	`+ UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureOffsetX(int id)`
	`313`	`+ {`
	`314`	`+ if (auto window = GetWindow(id))`
	`315`	`+ {`
	`316`	`+ return window->GetTextureOffsetX();`
	`317`	`+ }`
	`318`	`+ return 0;`
	`319`	`+ }`
	`320`	`+`
	`321`	`+ UNITY_INTERFACE_EXPORT UINT UNITY_INTERFACE_API UwcGetWindowTextureOffsetY(int id)`
	`322`	`+ {`
	`323`	`+ if (auto window = GetWindow(id))`
	`324`	`+ {`
	`325`	`+ return window->GetTextureOffsetY();`
`308`	`326`	`}`
`309`	`327`	`return 0;`
`310`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,18 +205,30 @@ BYTE* Window::GetBuffer() const`
`205`	`205`	`}`
`206`	`206`
`207`	`207`
`208`		`-UINT Window::GetBufferWidth() const`
	`208`	`+UINT Window::GetTextureWidth() const`
`209`	`209`	`{`
`210`	`210`	`return windowTexture_->GetWidth();`
`211`	`211`	`}`
`212`	`212`
`213`	`213`
`214`		`-UINT Window::GetBufferHeight() const`
	`214`	`+UINT Window::GetTextureHeight() const`
`215`	`215`	`{`
`216`	`216`	`return windowTexture_->GetHeight();`
`217`	`217`	`}`
`218`	`218`
`219`	`219`
	`220`	`+UINT Window::GetTextureOffsetX() const`
	`221`	`+{`
	`222`	`+ return windowTexture_->GetOffsetX();`
	`223`	`+}`
	`224`	`+`
	`225`	`+`
	`226`	`+UINT Window::GetTextureOffsetY() const`
	`227`	`+{`
	`228`	`+ return windowTexture_->GetOffsetY();`
	`229`	`+}`
	`230`	`+`
	`231`	`+`
`220`	`232`	`UINT Window::GetIconWidth() const`
`221`	`233`	`{`
`222`	`234`	`return iconTexture_->GetWidth();`