| |
@@ -1,12 +1,13 @@ |
| 1 |
1 |
|
// This Source Code is in the Public Domain per: http://litesoft.org/License.txt |
| 2 |
2 |
|
package org.litesoft.GWT.client.widgets.nonpublic; |
| 3 |
3 |
|
|
| 4 |
|
- |
import com.google.gwt.user.client.*; |
| 5 |
|
- |
import com.google.gwt.user.client.ui.*; |
| 6 |
4 |
|
import org.litesoft.GWT.client.widgets.*; |
| 7 |
5 |
|
import org.litesoft.render.*; |
| 8 |
6 |
|
import org.litesoft.uispecification.*; |
| 9 |
7 |
|
|
| |
8 |
+ |
import com.google.gwt.user.client.*; |
| |
9 |
+ |
import com.google.gwt.user.client.ui.*; |
| |
10 |
+ |
|
| 10 |
11 |
|
public abstract class AbstractSizableVerticalPanel extends VerticalPanel implements RenderableContainer, |
| 11 |
12 |
|
GwtRenderableRect |
| 12 |
13 |
|
{ |
| |
@@ -33,17 +34,14 @@ |
| 33 |
34 |
|
mOuterElement = pElement; |
| 34 |
35 |
|
} |
| 35 |
36 |
|
|
| 36 |
|
- |
protected AbstractSizableVerticalPanel( StyleSet pStyleSet, |
| 37 |
|
- |
RenderContainmentApproach pContainmentApproachX, |
| 38 |
|
- |
RenderContainmentApproach pContainmentApproachY ) |
| |
37 |
+ |
protected AbstractSizableVerticalPanel( StyleSet pStyleSet, RenderContainmentApproach pContainmentApproachX, RenderContainmentApproach pContainmentApproachY ) |
| 39 |
38 |
|
{ |
| 40 |
39 |
|
mSizingElement = mOuterElement = super.getElement(); |
| 41 |
40 |
|
|
| 42 |
41 |
|
pContainmentApproachX = RenderContainmentApproach.deNull( pContainmentApproachX ); |
| 43 |
42 |
|
pContainmentApproachY = RenderContainmentApproach.deNull( pContainmentApproachY ); |
| 44 |
43 |
|
|
| 45 |
|
- |
Overflow zCombinedOverflow = ContainerSupport.getAppropriateCombinedOverflow( pContainmentApproachX, |
| 46 |
|
- |
pContainmentApproachY ); |
| |
44 |
+ |
Overflow zCombinedOverflow = ContainerSupport.getAppropriateCombinedOverflow( pContainmentApproachX, pContainmentApproachY ); |
| 47 |
45 |
|
|
| 48 |
46 |
|
if ( (pStyleSet == null) && zCombinedOverflow.isNone() ) // Not Stylable & Overflow == _None |
| 49 |
47 |
|
{ |
| |
@@ -60,16 +58,14 @@ |
| 60 |
58 |
|
|
| 61 |
59 |
|
if ( zCombinedOverflow.isScrolledOrClipped() ) |
| 62 |
60 |
|
{ |
| 63 |
|
- |
zContainerParentElement = CommonElementHelper.appendToParent( mSizingElement = DOM.createDiv(), |
| 64 |
|
- |
zContainerParentElement ); |
| |
61 |
+ |
zContainerParentElement = CommonElementHelper.appendToParent( mSizingElement = DOM.createDiv(), zContainerParentElement ); |
| 65 |
62 |
|
String zOverflowClass = CommonElementHelper.determineOverflowClass( zCombinedOverflow.isClipped() ); |
| 66 |
63 |
|
CommonElementHelper.setStyleClass( zContainerParentElement, zOverflowClass ); |
| 67 |
64 |
|
} |
| 68 |
65 |
|
DOM.appendChild( zContainerParentElement, zOldOuterElement ); |
| 69 |
66 |
|
} |
| 70 |
67 |
|
|
| 71 |
|
- |
mRenderHelperX = new Gwt1dContainerRenderHelperX( this, pContainmentApproachX, |
| 72 |
|
- |
RenderContainerChildrenPolicy.Propogate ) |
| |
68 |
+ |
mRenderHelperX = new Gwt1dContainerRenderHelperX( this, pContainmentApproachX, RenderContainerChildrenPolicy.Propogate ) |
| 73 |
69 |
|
{ |
| 74 |
70 |
|
@Override |
| 75 |
71 |
|
protected Object[] getChildObjects() |
| |
@@ -77,8 +73,7 @@ |
| 77 |
73 |
|
return ContainerSupport.toArray( getChildren() ); |
| 78 |
74 |
|
} |
| 79 |
75 |
|
}; |
| 80 |
|
- |
mRenderHelperY = new Gwt1dContainerRenderHelperY( this, pContainmentApproachY, |
| 81 |
|
- |
RenderContainerChildrenPolicy.Distribute ) |
| |
76 |
+ |
mRenderHelperY = new Gwt1dContainerRenderHelperY( this, pContainmentApproachY, RenderContainerChildrenPolicy.Distribute ) |
| 82 |
77 |
|
{ |
| 83 |
78 |
|
@Override |
| 84 |
79 |
|
protected Object[] getChildObjects() |
View this file contents
View the full history
Commits for