浏览代码

Fixed horizontalPaddingAndBorder measurement for IE6. Vertical version could use a similar fix, but since there are no known issues currently, keeping it simple.

Added a classname to VWindow: v-window-footer-no-resize. This is needed by IE7, that fails to render floated resizebox inside the footer properly.

svn changeset:7986/svn branch:6.0
tags/6.7.0.beta1
Jouni Koivuviita 15 年前
父节点
当前提交
798d35b70d
共有 2 个文件被更改,包括 11 次插入0 次删除
  1. 8
    0
      src/com/vaadin/terminal/gwt/client/Util.java
  2. 3
    0
      src/com/vaadin/terminal/gwt/client/ui/VWindow.java

+ 8
- 0
src/com/vaadin/terminal/gwt/client/Util.java 查看文件

@@ -257,6 +257,11 @@ public class Util {
public static int measureHorizontalPaddingAndBorder(Element element,
int paddingGuess) {
String originalWidth = DOM.getStyleAttribute(element, "width");
String originalOverflow = "";
if (BrowserInfo.get().isIE6()) {
originalOverflow = DOM.getStyleAttribute(element, "overflow");
DOM.setStyleAttribute(element, "overflow", "hidden");
}
int originalOffsetWidth = element.getOffsetWidth();
int widthGuess = (originalOffsetWidth - paddingGuess);
if (widthGuess < 1) {
@@ -266,6 +271,9 @@ public class Util {
int padding = element.getOffsetWidth() - widthGuess;

DOM.setStyleAttribute(element, "width", originalWidth);
if (BrowserInfo.get().isIE6()) {
DOM.setStyleAttribute(element, "overflow", originalOverflow);
}
return padding;
}


+ 3
- 0
src/com/vaadin/terminal/gwt/client/ui/VWindow.java 查看文件

@@ -614,9 +614,12 @@ public class VWindow extends VOverlay implements Container, ScrollListener {
private void setResizable(boolean resizability) {
resizable = resizability;
if (resizability) {
DOM.setElementProperty(footer, "className", CLASSNAME + "-footer");
DOM.setElementProperty(resizeBox, "className", CLASSNAME
+ "-resizebox");
} else {
DOM.setElementProperty(footer, "className", CLASSNAME + "-footer "
+ CLASSNAME + "-footer-noresize");
DOM.setElementProperty(resizeBox, "className", CLASSNAME
+ "-resizebox " + CLASSNAME + "-resizebox-disabled");
}

正在加载...
取消
保存