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

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index b148915..c6aab7d 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);
 }
@@ -171,7 +174,7 @@ bool Window::event(const Event &evnt)
 	case WM_RBUTTONUP:
 	case WM_MOUSEWHEEL:
 	case WM_MOUSEMOVE:
-	case WM_TOUCHMOVE:
+	case WM_TOUCH:
 		signal_input_event.emit(evnt);
 		break;
 	case WM_SIZE:
@@ -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:
@@ -197,6 +201,12 @@ bool Window::event(const Event &evnt)
 			signal_expose.emit(update_rect.left, update_rect.top, width, height, evnt);
 		}
 		break;
+	case WM_SETFOCUS:
+		signal_got_focus.emit();
+		break;
+	case WM_KILLFOCUS:
+		signal_lost_focus.emit();
+		break;
 	default:
 		return false;
 	}