| |
@@ -1,14 +1,15 @@ |
| 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.core.util.*; |
| 8 |
6 |
|
import org.litesoft.logger.*; |
| 9 |
7 |
|
import org.litesoft.render.*; |
| 10 |
8 |
|
import org.litesoft.uispecification.*; |
| 11 |
9 |
|
|
| |
10 |
+ |
import com.google.gwt.user.client.*; |
| |
11 |
+ |
import com.google.gwt.user.client.ui.*; |
| |
12 |
+ |
|
| 12 |
13 |
|
public interface GwtRenderableRect extends RenderableRect |
| 13 |
14 |
|
{ |
| 14 |
15 |
|
public static final Logger LOGGER = LoggerFactory.getLogger( GwtRenderableRect.class ); |
| |
@@ -225,13 +226,11 @@ |
| 225 |
226 |
|
|
| 226 |
227 |
|
public static class Size |
| 227 |
228 |
|
{ |
| 228 |
|
- |
public static void set( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, |
| 229 |
|
- |
Element pContainerElement, int pNewSize, int pDecorationSize ) |
| |
229 |
+ |
public static void set( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, Element pContainerElement, int pNewSize, int pDecorationSize ) |
| 230 |
230 |
|
{ |
| 231 |
231 |
|
if ( LOGGER.trace.isEnabled() ) |
| 232 |
232 |
|
{ |
| 233 |
|
- |
LOGGER.trace.log( "Size.set ", pDimensionHelper.getWhat(), " on ", pOnWidget.getClass(), |
| 234 |
|
- |
" NewSize= " + pNewSize, // |
| |
233 |
+ |
LOGGER.trace.log( "Size.set ", pDimensionHelper.getWhat(), " on ", pOnWidget.getClass(), " NewSize= " + pNewSize, // |
| 235 |
234 |
|
" DecorationSize= " + pDecorationSize, // |
| 236 |
235 |
|
" -> " + (pNewSize - pDecorationSize) ); |
| 237 |
236 |
|
} |
| |
@@ -239,15 +238,13 @@ |
| 239 |
238 |
|
} |
| 240 |
239 |
|
|
| 241 |
240 |
|
@SuppressWarnings({"UnusedDeclaration"}) |
| 242 |
|
- |
public static void set( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, |
| 243 |
|
- |
Element pSizingElement, int pNewSize ) |
| |
241 |
+ |
public static void set( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, Element pSizingElement, int pNewSize ) |
| 244 |
242 |
|
{ |
| 245 |
243 |
|
pDimensionHelper.setStyleDimension( pSizingElement, pNewSize ); |
| 246 |
244 |
|
} |
| 247 |
245 |
|
|
| 248 |
246 |
|
@SuppressWarnings({"UnusedDeclaration"}) |
| 249 |
|
- |
public static void clear( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, |
| 250 |
|
- |
Element pSizingElement ) |
| |
247 |
+ |
public static void clear( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, Element pSizingElement ) |
| 251 |
248 |
|
{ |
| 252 |
249 |
|
pDimensionHelper.removeStyleDimension( pSizingElement ); |
| 253 |
250 |
|
} |
| |
@@ -256,8 +253,7 @@ |
| 256 |
253 |
|
public static class DecorationSize |
| 257 |
254 |
|
{ |
| 258 |
255 |
|
@SuppressWarnings({"UnusedDeclaration"}) |
| 259 |
|
- |
public static int calculate( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, |
| 260 |
|
- |
Element pOuterElement, Element pContainerElement ) |
| |
256 |
+ |
public static int calculate( Widget pOnWidget, GwtElementDimensionHelper pDimensionHelper, Element pOuterElement, Element pContainerElement ) |
| 261 |
257 |
|
{ |
| 262 |
258 |
|
int zOuterDim = pDimensionHelper.getOffsetDimension( pOuterElement ); |
| 263 |
259 |
|
int zContainerDim = pDimensionHelper.getOffsetDimension( pContainerElement ); |
| |
@@ -270,14 +266,10 @@ |
| 270 |
266 |
|
public static StyleContainerElements createSCEs( Element pStyleParentElement, StyleSet pStyleSet ) |
| 271 |
267 |
|
{ |
| 272 |
268 |
|
return (pStyleSet == null) ? // |
| 273 |
|
- |
new StyleContainerElements( pStyleParentElement ) : new StyleContainerElements( |
| 274 |
|
- |
CommonElementHelper.appendToParent( pStyleSet.getOuterElement(), pStyleParentElement ), |
| 275 |
|
- |
pStyleSet.getInnerElement() ); |
| |
269 |
+ |
new StyleContainerElements( pStyleParentElement ) : new StyleContainerElements( CommonElementHelper.appendToParent( pStyleSet.getOuterElement(), pStyleParentElement ), pStyleSet.getInnerElement() ); |
| 276 |
270 |
|
} |
| 277 |
271 |
|
|
| 278 |
|
- |
public static Overflow getAppropriateCombinedOverflow( |
| 279 |
|
- |
RenderContainmentApproach pContainmentApproachX, |
| 280 |
|
- |
RenderContainmentApproach pContainmentApproachY ) |
| |
272 |
+ |
public static Overflow getAppropriateCombinedOverflow( RenderContainmentApproach pContainmentApproachX, RenderContainmentApproach pContainmentApproachY ) |
| 281 |
273 |
|
{ |
| 282 |
274 |
|
return pContainmentApproachX.getOverflow().mergeWith( pContainmentApproachY.getOverflow() ); |
| 283 |
275 |
|
} |
View this file contents
View the full history
Commits for