aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2008-12-11 11:56:24 +0000
committerArtur Signell <artur.signell@itmill.com>2008-12-11 11:56:24 +0000
commitdb6521080c3a88e680ccfaea3f663eda87a0c508 (patch)
tree6a169835b3b89e309c4c5b1a0fbeb8a5e176ee90 /src
parent43f74e65114d1c09bbd1acc655a840a61a9ffc7d (diff)
downloadvaadin-framework-db6521080c3a88e680ccfaea3f663eda87a0c508.tar.gz
vaadin-framework-db6521080c3a88e680ccfaea3f663eda87a0c508.zip
Fix for #2312 - RichTextArea size in IE7
svn changeset:6169/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java
index fc515af1fb..af8cfe5123 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java
@@ -14,6 +14,7 @@ import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.RichTextArea;
import com.google.gwt.user.client.ui.Widget;
import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
import com.itmill.toolkit.terminal.gwt.client.Paintable;
import com.itmill.toolkit.terminal.gwt.client.UIDL;
import com.itmill.toolkit.terminal.gwt.client.Util;
@@ -185,6 +186,13 @@ public class IRichTextArea extends Composite implements Paintable, Field,
}
super.setWidth(w + "px");
+ } else if (width.equals("") && BrowserInfo.get().isIE7()) {
+ /*
+ * IE7 cannot calculate the width of the 100% iframe if there is no
+ * width specified for the parent so we use the width of the
+ * toolbar.
+ */
+ super.setWidth(formatter.getOffsetWidth() + "px");
} else {
super.setWidth(width);
}