From 91a0b2f1ce2e4e4a6c177b4c12e44251a30f7cb5 Mon Sep 17 00:00:00 2001
From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Fri, 2 Nov 2007 14:43:39 +0000
Subject: [PATCH] Fixed #1005

svn changeset:2698/svn branch:trunk
---
 .../toolkit/terminal/gwt/client/ui/IWindow.java | 17 ++++++++++++-----
 .../gwt/public/default/window/window.css        | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
index ed73150b45..e6694023da 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
@@ -27,6 +27,10 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
 	private static final int DEFAULT_HEIGHT = 300;
 
 	private static final int DEFAULT_WIDTH = 400;
+	
+	private static final int MIN_HEIGHT = 60;
+
+	private static final int MIN_WIDTH = 80;
 
 	private static Vector windowOrder = new Vector();
 
@@ -128,6 +132,8 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
 	}
 
 	protected void constructDOM() {
+		Element outerHeader = DOM.createDiv();
+		DOM.setElementProperty(outerHeader, "className", CLASSNAME + "-outerheader");
 		header = DOM.createDiv();
 		DOM.setElementProperty(header, "className", CLASSNAME + "-header");
 		contents = DOM.createDiv();
@@ -155,7 +161,8 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
 		DOM.sinkEvents(wrapper, Event.ONKEYDOWN);
 
 		DOM.appendChild(wrapper2, closeBox);
-		DOM.appendChild(wrapper2, header);
+		DOM.appendChild(wrapper2, outerHeader);
+		DOM.appendChild(outerHeader, header);
 		DOM.appendChild(wrapper2, contents);
 		DOM.appendChild(wrapper2, footer);
 		DOM.appendChild(wrapper, wrapper2);
@@ -322,11 +329,11 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
 
 	public void setSize(Event event, boolean updateVariables) {
 		int w = DOM.eventGetScreenX(event) - startX + origW;
-		if (w < 60)
-			w = 60;
+		if (w < MIN_WIDTH)
+			w = MIN_WIDTH;
 		int h = DOM.eventGetScreenY(event) - startY + origH;
-		if (h < 60)
-			h = 60;
+		if (h < MIN_HEIGHT)
+			h = MIN_HEIGHT;
 		setWidth(w + "px");
 		setHeight(h + "px");
 		if (updateVariables) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css b/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css
index b42e149878..94ba94d192 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css
@@ -24,6 +24,12 @@
 	background: transparent url(img/right-bg.png) repeat-y top right;
 }
 
+.i-window-outerheader {
+	height: 18px;
+	padding: 8px 34px 14px 12px;
+	background: #fff;
+}
+
 .i-window-header {
 	font-size: 18px;
 	line-height: 18px;
@@ -31,18 +37,17 @@
 	letter-spacing: -0.03em;
 	color: #f14c1a;
 	white-space: nowrap;
-	height: 18px;
-	padding: 6px 18px 14px 12px;
-	background: #fff;
 	cursor: move;
+	text-overflow:ellipsis;
+	overflow:hidden;
 }
 
-.i-window-header:before {
+.i-window-outerheader:before {
 	display: block;
 	content: "";
 	width: 21px;
 	height: 21px;
-	margin: -27px 0 6px -32px;
+	margin: -29px 0 6px -32px;
 	background: transparent url(img/top-left.png);
 }
 
-- 
2.39.5