|
@@ -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 AbstractSizableSimplePanel extends SimplePanel implements RenderableContainer, |
11 |
12 |
|
GwtRenderableRect, |
12 |
13 |
|
SingleWidgetContainer |
|
@@ -14,9 +15,7 @@ |
14 |
15 |
|
private Element mStyleElement; |
15 |
16 |
|
private Element mContainerElement; |
16 |
17 |
|
|
17 |
|
- |
private AbstractSizableSimplePanel( DIVconstrainer pDIVconstrainer, StyleSet pStyleSet, |
18 |
|
- |
RenderContainmentApproach pContainmentApproachX, |
19 |
|
- |
RenderContainmentApproach pContainmentApproachY ) |
|
18 |
+ |
private AbstractSizableSimplePanel( DIVconstrainer pDIVconstrainer, StyleSet pStyleSet, RenderContainmentApproach pContainmentApproachX, RenderContainmentApproach pContainmentApproachY ) |
20 |
19 |
|
{ |
21 |
20 |
|
super( pDIVconstrainer.getOuterElement() ); |
22 |
21 |
|
StyleContainerElements zSCEs = ContainerSupport.createSCEs( pDIVconstrainer.getInnerElement(), pStyleSet ); |
|
@@ -26,8 +25,7 @@ |
26 |
25 |
|
pContainmentApproachX = RenderContainmentApproach.deNull( pContainmentApproachX ); |
27 |
26 |
|
pContainmentApproachY = RenderContainmentApproach.deNull( pContainmentApproachY ); |
28 |
27 |
|
|
29 |
|
- |
Overflow zCombinedOverflow = ContainerSupport.getAppropriateCombinedOverflow( pContainmentApproachX, |
30 |
|
- |
pContainmentApproachY ); |
|
28 |
+ |
Overflow zCombinedOverflow = ContainerSupport.getAppropriateCombinedOverflow( pContainmentApproachX, pContainmentApproachY ); |
31 |
29 |
|
if ( zCombinedOverflow.isScrolledOrClipped() ) |
32 |
30 |
|
{ |
33 |
31 |
|
mContainerElement = CommonElementHelper.appendToParent( DOM.createDiv(), zContainerParentElement ); |
|
@@ -43,8 +41,7 @@ |
43 |
41 |
|
mContainerElement = zContainerParentElement; // Not Stylable & Overflow == _None |
44 |
42 |
|
} |
45 |
43 |
|
|
46 |
|
- |
mRenderHelperX = new Gwt1dContainerRenderHelperX( this, pContainmentApproachX, |
47 |
|
- |
RenderContainerChildrenPolicy.Propogate ) |
|
44 |
+ |
mRenderHelperX = new Gwt1dContainerRenderHelperX( this, pContainmentApproachX, RenderContainerChildrenPolicy.Propogate ) |
48 |
45 |
|
{ |
49 |
46 |
|
@Override |
50 |
47 |
|
protected Object[] getChildObjects() |
|
@@ -52,8 +49,7 @@ |
52 |
49 |
|
return getChildren(); |
53 |
50 |
|
} |
54 |
51 |
|
}; |
55 |
|
- |
mRenderHelperY = new Gwt1dContainerRenderHelperY( this, pContainmentApproachY, |
56 |
|
- |
RenderContainerChildrenPolicy.Propogate ) |
|
52 |
+ |
mRenderHelperY = new Gwt1dContainerRenderHelperY( this, pContainmentApproachY, RenderContainerChildrenPolicy.Propogate ) |
57 |
53 |
|
{ |
58 |
54 |
|
@Override |
59 |
55 |
|
protected Object[] getChildObjects() |
|
@@ -63,9 +59,7 @@ |
63 |
59 |
|
}; |
64 |
60 |
|
} |
65 |
61 |
|
|
66 |
|
- |
protected AbstractSizableSimplePanel( StyleSet pStyleSet, |
67 |
|
- |
RenderContainmentApproach pContainmentApproachX, |
68 |
|
- |
RenderContainmentApproach pContainmentApproachY ) |
|
62 |
+ |
protected AbstractSizableSimplePanel( StyleSet pStyleSet, RenderContainmentApproach pContainmentApproachX, RenderContainmentApproach pContainmentApproachY ) |
69 |
63 |
|
{ |
70 |
64 |
|
this( CommonElementHelper.createDIVconstrainer(), pStyleSet, pContainmentApproachX, pContainmentApproachY ); |
71 |
65 |
|
} |
|
@@ -268,7 +262,7 @@ |
268 |
262 |
|
public int getDecorationSizeY() |
269 |
263 |
|
{ |
270 |
264 |
|
return DecorationSize.calculate( this, GwtElementDimensionHelperY.INSTANCE, // |
271 |
|
- |
getElement(), getContainerElement() ); |
|
265 |
+ |
getElement(), getContainerElement() ); |
272 |
266 |
|
} |
273 |
267 |
|
|
274 |
268 |
|
@Override |