Revision: 7251 Author: [email protected] Date: Fri Dec 4 11:14:59 2009 Log: Merging /trunk c7242, c7250 into this branch.
http://code.google.com/p/google-web-toolkit/source/detail?r=7251 Modified: /releases/2.0/branch-info.txt /releases/2.0/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseConstants_zh.properties /releases/2.0/user/src/com/google/gwt/user/client/ui/DockLayoutPanel.java /releases/2.0/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java ======================================= --- /releases/2.0/branch-info.txt Thu Dec 3 14:43:23 2009 +++ /releases/2.0/branch-info.txt Fri Dec 4 11:14:59 2009 @@ -1179,3 +1179,11 @@ Adding src to classpath of generated test targets. svn merge --ignore-ancestry -c7246 https://google-web-toolkit.googlecode.com/svn/trunk/ . +tr...@7242 was merged into this branch + Fix incorrect delimiter in Chinese Showcase translation. + svn merge --ignore-ancestry -c7242 https://google-web-toolkit.googlecode.com/svn/trunk/ . + +tr...@7250 was merged into this branch + A set of fixes for three layout issues: 4160, 4241, and 4243. + svn merge --ignore-ancestry -c7250 https://google-web-toolkit.googlecode.com/svn/trunk/ . + ======================================= --- /releases/2.0/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseConstants_zh.properties Wed Oct 28 08:49:46 2009 +++ /releases/2.0/samples/showcase/src/com/google/gwt/sample/showcase/client/ShowcaseConstants_zh.properties Fri Dec 4 11:14:59 2009 @@ -74,7 +74,7 @@ cwDateTimeFormatFormattedLabel = <b>格式化的值： </b> cwDateTimeFormatInvalidPattern =无效模板 cwDateTimeFormatPatternLabel = <b>模板： </b> -cwDateTimeFormatPatterns = 完全日期时间, 长日期时间, 中日期时间, 短日期时 间, 完全日期, 长日期, 中日期, 短日期, 完全时间， 长时间, 中时间, 短时间, 自 定义风俗 +cwDateTimeFormatPatterns = 完全日期时间, 长日期时间, 中日期时间, 短日期时 间, 完全日期, 长日期, 中日期, 短日期, 完全时间, 长时间, 中时间, 短时间, 自定 义风俗 cwDateTimeFormatValueLabel = <b>需要格式的值： </b> cwDecoratorPanelFormDescription = 说明: cwDecoratorPanelFormName = 名: ======================================= --- /releases/2.0/user/src/com/google/gwt/user/client/ui/DockLayoutPanel.java Tue Dec 1 21:26:37 2009 +++ /releases/2.0/user/src/com/google/gwt/user/client/ui/DockLayoutPanel.java Fri Dec 4 11:14:59 2009 @@ -189,7 +189,7 @@ } public void animate(int duration) { - animate(0, null); + animate(duration, null); } public void animate(int duration, final Layout.AnimationCallback callback) { @@ -338,7 +338,15 @@ widget.removeFromParent(); // Logical attach. - getChildren().add(widget); + WidgetCollection children = getChildren(); + if (before == null) { + children.add(widget); + } + else { + int index = children.indexOf(before); + children.insert(widget, index); + } + if (direction == Direction.CENTER) { center = widget; } ======================================= --- /releases/2.0/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java Tue Dec 1 21:26:37 2009 +++ /releases/2.0/user/src/com/google/gwt/user/client/ui/StackLayoutPanel.java Fri Dec 4 11:14:59 2009 @@ -211,7 +211,7 @@ } private void animate(int duration) { - int top = 0, bottom = 0; + double top = 0, bottom = 0; int i = 0, visibleIndex = -1; for (; i < layoutData.size(); ++i) { LayoutData data = layoutData.get(i); -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
