diff --git a/uppdev/ToolWin/ToolWin.cpp b/uppdev/ToolWin/ToolWin.cpp
new file mode 100644
index 000000000..58445517a
--- /dev/null
+++ b/uppdev/ToolWin/ToolWin.cpp
@@ -0,0 +1,247 @@
+#include "ToolWin.h"
+
+NAMESPACE_UPP
+
+int ToolWin::GetTitleCy() const
+{
+	return max(GetStdFontCy(), 16);
+}
+
+int ToolWin::GetBorder() const
+{
+	return max(2, GetStdFontCy() / 4);
+}
+
+Rect ToolWin::GetMargins() const
+{
+	Rect r;
+	r.left = r.right = r.top = r.bottom = GetBorder();
+	r.top += GetTitleCy();
+	return r;
+}
+
+Size ToolWin::AddMargins(Size sz) const
+{
+	Rect m = GetMargins();
+	sz += Size(m.left + m.right, m.top + m.bottom);
+	return sz;
+}
+
+void ToolWin::FrameAddSize(Size& sz)
+{
+	sz = AddMargins(sz);
+}
+
+void ToolWin::FrameLayout(Rect& r)
+{
+	if(GetParent()) {
+		close.Hide();
+		return;
+	}
+	close.Show();
+	close.SetFrameRect(r.right - 18, r.top, 16, 16);
+	Rect m = GetMargins();
+	r.left += m.left;
+	r.right -= m.right;
+	r.top += m.top;
+	r.bottom -= m.bottom;
+	DDUMP(GetScreenRect());
+	DDUMP(GetRect());
+	DDUMP(IsVisible());
+}
+
+void ToolWin::FramePaint(Draw& w, const Rect& rr)
+{
+	if(GetParent())
+		return;
+	int bn = GetBorder();
+	Rect r = rr;
+	for(int i = 0; i < bn; i++) {
+		DrawFrame(w, r, decode(i, 0, SColorShadow(), 1, SColorLight(), SColorFace()));	
+		r.Deflate(1);
+	}
+	int fcy = GetStdFontCy();
+	int titlecy = GetTitleCy();
+	w.DrawRect(r.left, r.top, r.GetWidth(), titlecy, Blend(SColorFace(), SColorShadow()));
+	DrawTextEllipsis(w, r.left + fcy / 4, r.top + (titlecy - fcy) / 2,
+	                 r.GetWidth() - fcy / 2 - 16, GetTitle(), "...", StdFont(), SColorText());
+}
+
+void ToolWin::StartMouseDrag0()
+{
+	p0 = GetMousePos();
+	rect0 = GetRect();
+	SetCapture();	
+}
+
+void ToolWin::StartMouseDrag()
+{
+	DLOG("StartMouseDrag1");
+	if(HasCapture() || !IsNull(dragdir))
+		return;
+	DLOG("StartMouseDrag2");
+	dragdir = Point(0, 0);
+	StartMouseDrag0();
+	DLOG("StartMouseDrag3");
+	DDUMP(HasCapture());
+}
+
+void ToolWin::MouseMove(Point, dword)
+{
+	Point p = GetMousePos() - GetScreenRect().TopLeft();
+	DLOG("MouseMove " << HasCapture());
+	if(!HasCapture())
+		return;
+	DLOG("MouseMove1");
+	Rect r = rect0;
+	Point off = GetMousePos() - p0;
+	if(dragdir == Point(0, 0)) {
+		r.Offset(off);
+		Moving();
+	}
+	else {
+		Size minsz = GetMinSize();
+		Size maxsz = GetMaxSize();
+		if(dragdir.x == -1)
+			r.left = minmax(r.left + off.x, r.right - maxsz.cx, r.right - minsz.cx);
+		if(dragdir.x == 1)
+			r.right = minmax(r.right + off.x, r.left + minsz.cx, r.left + maxsz.cx);
+		if(dragdir.y == -1)
+			r.top = minmax(r.top + off.y, r.bottom - maxsz.cy, r.bottom - maxsz.cy);
+		if(dragdir.y == 1)
+			r.bottom = minmax(r.bottom + off.y, r.top + minsz.cy, r.top + maxsz.cy);
+	}
+	SetRect(r);
+	DDUMP(HasCapture());
+}
+
+void ToolWin::LeftUp(Point, dword)
+{
+	if(HasCapture() && dragdir == Point(0, 0)) {
+		dragdir = Null;
+		MoveEnd();
+	}
+}
+
+Image ToolWin::CursorImage(Point, dword)
+{
+	Point dir = HasCapture() ? dragdir : GetDir(GetMousePos() - GetScreenRect().TopLeft());
+	if(IsNull(dir))
+		return Image::Arrow();
+	static Image (*im[9])() = {
+		Image::SizeTopLeft, Image::SizeLeft, Image::SizeBottomLeft,
+		Image::SizeTop, Image::Arrow, Image::SizeBottom,
+		Image::SizeTopRight, Image::SizeRight, Image::SizeBottomRight,
+	};
+	return (*im[(dir.x + 1) * 3 + (dir.y + 1)])();
+}
+
+Image ToolWin::FrameMouseEvent(int event, Point p, int zdelta, dword keyflags)
+{
+	switch(event) {
+	case LEFTDOWN:
+		DLOG("LeftDown!");
+		StartMouseDrag0();
+		dragdir = GetDir(p);
+		if(IsNull(dragdir))
+			break;
+		if(dragdir == Point(0, 0))
+			MoveBegin();
+		DDUMP(HasCapture());
+		break;
+	case MOUSEMOVE:
+		MouseMove(p, keyflags);
+		break;
+	case LEFTUP:
+		LeftUp(p, keyflags);
+		break;
+	case CURSORIMAGE:
+		return CursorImage(p, keyflags);
+	}
+	return Image::Arrow();
+}
+
+Point ToolWin::GetDir(Point p) const
+{
+	Size sz = GetSize();
+	int b = GetBorder();
+	if(p.x >= b && p.y > b && p.x < sz.cx - b && p.y < b + GetTitleCy())
+		return Point(0, 0);
+	if(Rect(sz).Deflated(b).Contains(p))
+		return Null;
+	b *= 4;
+	Point r(0, 0);
+	if(p.x < b)
+		r.x = -1;
+	if(p.x >= sz.cx - b)
+		r.x = 1;
+	if(p.y < b)
+		r.y = -1;
+	if(p.y >= sz.cy - b)
+		r.y = 1;
+	return r;
+}
+
+/*
+Size ToolWin::GetMinSize() const
+{
+	return AddMargins(client ? client->GetMinSize() : Size(0, 0));
+}
+
+Size ToolWin::GetMaxSize() const
+{
+	return AddMargins(client ? client->GetMaxSize() : Size(99999, 99999));
+}
+*/
+
+void ToolWin::SetClientRect(Rect r)
+{
+	Rect m = GetMargins();
+	r.left += m.left;
+	r.right += m.right;
+	r.top += m.top;
+	r.bottom += m.bottom;
+	SetRect(r);
+}
+
+void ToolWin::PlaceClientRect(Rect r)
+{
+	Size sz = r.GetSize();
+	Point pt = GetMousePos();
+	int b = GetBorder();
+	int t = GetTitleCy();
+	if(!(pt.x >= r.left + b && pt.x < r.right - b))
+		r.left = pt.x - sz.cx / 2;
+	if(!(pt.y >= r.top + b && pt.y < r.top + b + t))
+		r.top = pt.y - b - t / 2;
+	r.SetSize(sz);
+	Rect m = GetMargins();
+	r.left += m.left;
+	r.right += m.right;
+	r.top += m.top;
+	r.bottom += m.bottom;
+	SetRect(r);
+}
+
+void ToolWin::DoClose()
+{
+	WhenClose();
+}
+
+void ToolWin::MoveBegin() {}
+
+void ToolWin::Moving() {}
+
+void ToolWin::MoveEnd() {}
+
+ToolWin::ToolWin()
+{
+	dragdir = Null;
+	Add(close);
+	close.Image(CtrlImg::cross());
+	close <<= THISBACK(DoClose);
+	AddFrame(*this);
+	FrameLess();
+}
+
+END_UPP_NAMESPACE
diff --git a/uppdev/ToolWin/ToolWin.h b/uppdev/ToolWin/ToolWin.h
new file mode 100644
index 000000000..73f2dc0c2
--- /dev/null
+++ b/uppdev/ToolWin/ToolWin.h
@@ -0,0 +1,47 @@
+#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
+
+class ToolWin : public TopWindow, public CtrlFrame {
+public:
+	virtual void   FrameAddSize(Size& sz);
+	virtual void   FrameLayout(Rect& r);
+	virtual void   FramePaint(Draw& w, const Rect& r);
+
+	virtual void   MouseMove(Point p, dword keyflags);
+	virtual void   LeftUp(Point p, dword keyflags);
+	virtual Image  CursorImage(Point p, dword keyflags);
+	virtual Image  FrameMouseEvent(int event, Point p, int zdelta, dword keyflags);
+
+private:		
+	Point      p0;
+	Rect       rect0;
+	Point      dragdir;
+	ToolButton close;
+
+	void DoClose();
+	
+	Point GetDir(Point p) const;
+	int   GetTitleCy() const;
+	int   GetBorder() const;
+	Rect  GetMargins() const;
+	Size  AddMargins(Size sz) const;
+	
+	void StartMouseDrag0();
+
+	typedef ToolWin CLASSNAME;
+
+public:
+	virtual void MoveBegin();
+	virtual void Moving();
+	virtual void MoveEnd();
+
+	void StartMouseDrag();
+	void SetClientRect(Rect r);
+
+	void PlaceClientRect(Rect r);
+	
+	ToolWin();
+};
+
+END_UPP_NAMESPACE
diff --git a/uppdev/ToolWin/ToolWin.upp b/uppdev/ToolWin/ToolWin.upp
new file mode 100644
index 000000000..ce76207d2
--- /dev/null
+++ b/uppdev/ToolWin/ToolWin.upp
@@ -0,0 +1,11 @@
+uses
+	CtrlLib;
+
+file
+	ToolWin.h,
+	ToolWin.cpp,
+	main.cpp;
+
+mainconfig
+	"" = "GUI SSE2";
+
diff --git a/uppdev/ToolWin/init b/uppdev/ToolWin/init
new file mode 100644
index 000000000..f7aa79d84
--- /dev/null
+++ b/uppdev/ToolWin/init
@@ -0,0 +1,4 @@
+#ifndef _ToolWin_icpp_init_stub
+#define _ToolWin_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppdev/ToolWin/main.cpp b/uppdev/ToolWin/main.cpp
new file mode 100644
index 000000000..dff86f108
--- /dev/null
+++ b/uppdev/ToolWin/main.cpp
@@ -0,0 +1,8 @@
+#include <ToolWin/ToolWin.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	ToolWin().Run();
+}