From 318f32607fb012fef2fee78b66bb3915008da321 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 26 Jun 2013 17:28:43 +0000
Subject: [PATCH] Docking: Fixed issue with ToolWin being resized when docked

git-svn-id: svn://ultimatepp.org/upp/trunk@6155 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Docking/ToolWin.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/uppsrc/Docking/ToolWin.cpp b/uppsrc/Docking/ToolWin.cpp
index d5e179b82..d35990c24 100644
--- a/uppsrc/Docking/ToolWin.cpp
+++ b/uppsrc/Docking/ToolWin.cpp
@@ -84,7 +84,7 @@ void ToolWin::StartMouseDrag()
 
 void ToolWin::MouseMove(Point, dword)
 {
-	if(!HasCapture())
+	if(!HasCapture() || GetParent())
 		return;
 	Rect r = rect0;
 	Point off = GetMousePos() - p0;
@@ -133,6 +133,8 @@ Image ToolWin::CursorImage(Point, dword)
 
 Image ToolWin::FrameMouseEvent(int event, Point p, int zdelta, dword keyflags)
 {
+	if(GetParent())
+		return Image::Arrow();
 	switch(event) {
 	case LEFTDOWN:
 		StartMouseDrag0();