2 files changed, 28 insertions, 0 deletions
diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index b0e23c4..c52d908 100755
--- a/src/nigui/private/windows/platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
@@ -947,6 +947,20 @@ method `control=`(window: WindowImpl, control: Control) =
   procCall window.Window.`control=`(control)
   pSetParent(cast[ControlImpl](control).fHandle, window.fHandle)
 
+method mousePosition(window: Window): tuple[x, y: int] =
+  var p: Point
+  if not GetCursorPos(p):
+    result.x = -1
+    result.y = -1
+    return
+  if not ScreenToClient(cast[WindowImpl](window).fHandle, p):
+    result.x = -1
+    result.y = -1
+    return
+  result.x = p.x
+  result.y = p.y
+
+
 method `iconPath=`(window: WindowImpl, iconPath: string) =
   procCall window.Window.`iconPath=`(iconPath)
   var bitmap: pointer
@@ -1298,6 +1312,19 @@ proc pCustomControlWndProc(hWnd: pointer, uMsg: int32, wParam, lParam: pointer):
     return cast[pointer](true)
   result = CallWindowProcW(pCommonWndProc, hWnd, uMsg, wParam, lParam)
 
+method mousePosition(control: Control): tuple[x, y: int] =
+  var p: Point
+  if not GetCursorPos(p):
+    result.x = -1
+    result.y = -1
+    return
+  if not ScreenToClient(cast[ControlImpl](control).fHandle, p):
+    result.x = -1
+    result.y = -1
+    return
+  result.x = p.x
+  result.y = p.y
+
 
 # ----------------------------------------------------------------------------------------
 #                                      Container
diff --git a/src/nigui/private/windows/windows.nim b/src/nigui/private/windows/windows.nim
index 26324f8..2c4e09c 100755
--- a/src/nigui/private/windows/windows.nim
+++ b/src/nigui/private/windows/windows.nim
@@ -467,6 +467,7 @@ proc SetClipboardData*(uFormat: int32, hMem: pointer): pointer {.importc, libUse
 proc EmptyClipboard*(): bool {.importc, libUser32.}
 proc MapVirtualKeyW*(uCode, uMapType: int32): int32 {.importc, libUser32.}
 proc GetCursorPos*(lpPoint: var Point): bool {.importc, libUser32.}
+proc ScreenToClient*(hWnd: pointer, lpPoint: var Point): bool {.importc, libUser32.}
 proc MonitorFromPoint*(pt: Point, dwFlags: int32): pointer {.importc, libUser32.}
 
 type GetDpiForWindowType* = proc(hWnd: pointer): int32 {.gcsafe, stdcall.} # not available on Windows 7