X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fwindows%2Fwindow.cpp;fp=source%2Fgraphics%2Fwindows%2Fwindow.cpp;h=8d7a342621635dd3e3c738abad67939ddf5c8ac0;hb=9c7ae47da64904c2aa9a9969870ca8befebe7d02;hp=b148915d9bc94b6581037a682c3982c0bf78212f;hpb=f6ca714e2258f4cad433801c88264947d4c2d14c;p=libs%2Fgui.git

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index b148915..8d7a342 100644
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -76,7 +76,8 @@ void Window::platform_init()
 		"mspgui",
 		"Window",
 		style,
-		CW_USEDEFAULT, CW_USEDEFAULT,
+		(options.user_position ? options.x : CW_USEDEFAULT),
+		(options.user_position ? options.y : CW_USEDEFAULT),
 		rect.right-rect.left, rect.bottom-rect.top,
 		0,
 		0,
@@ -118,6 +119,8 @@ void Window::platform_reconfigure(bool fullscreen_changed)
 
 	if(options.fullscreen)
 		SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
+	else if(options.user_position)
+		SetWindowPos(priv->window, 0, options.x, options.y, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER);
 	else
 		SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER);
 }
@@ -183,6 +186,7 @@ bool Window::event(const Event &evnt)
 	case WM_MOVE:
 		options.x = static_cast<short>(LOWORD(evnt.lparam));
 		options.y = static_cast<short>(HIWORD(evnt.lparam));
+		moving = false;
 		signal_move.emit(options.x, options.y);
 		break;
 	case WM_CLOSE: