|
@@ -11,8 +11,7 @@ |
11 |
11 |
|
RenderParticipatingAdapter pParticipatingAdapter, // |
12 |
12 |
|
RenderDimensionAdapter pDimensionAdapter ) |
13 |
13 |
|
{ |
14 |
|
- |
super( pRectangularRenderableObject, pRenderAccessor, pSizingApproach, pParticipatingAdapter, |
15 |
|
- |
pDimensionAdapter ); |
|
14 |
+ |
super( pRectangularRenderableObject, pRenderAccessor, pSizingApproach, pParticipatingAdapter, pDimensionAdapter ); |
16 |
15 |
|
} |
17 |
16 |
|
|
18 |
17 |
|
protected DetermineNaturalSizeRHP mDetermineNaturalSize; |
|
@@ -66,8 +65,7 @@ |
66 |
65 |
|
setSizingChange( mSizedTo, null ); |
67 |
66 |
|
} |
68 |
67 |
|
setExplicitlySized( false ); |
69 |
|
- |
getDimensionAdapter().removeSetSize( |
70 |
|
- |
getRectangularRenderableObject() ); // Remove any previous Set Sizes |
|
68 |
+ |
getDimensionAdapter().removeSetSize( getRectangularRenderableObject() ); // Remove any previous Set Sizes |
71 |
69 |
|
super.LLrestoreForLayout(); |
72 |
70 |
|
} |
73 |
71 |
|
|
|
@@ -169,8 +167,7 @@ |
169 |
167 |
|
|
170 |
168 |
|
protected final boolean LLsizeChangePending() |
171 |
169 |
|
{ |
172 |
|
- |
return mSizedToPending || (mSetSizePending != null) || (mFloodSetSizePending != null) || |
173 |
|
- |
(mAdjustSizeByPending != null) || (mFloodAdjustSizeByPending != null); |
|
170 |
+ |
return mSizedToPending || (mSetSizePending != null) || (mFloodSetSizePending != null) || (mAdjustSizeByPending != null) || (mFloodAdjustSizeByPending != null); |
174 |
171 |
|
} |
175 |
172 |
|
|
176 |
173 |
|
protected final RenderProcessResult LLrequestSetSize( MutateSizeRHP pMutateSizeRHP, int pRequestedSize ) |
|
@@ -179,22 +176,19 @@ |
179 |
176 |
|
return LLprocessPendingSizeChange( pMutateSizeRHP ); |
180 |
177 |
|
} |
181 |
178 |
|
|
182 |
|
- |
protected final RenderProcessResult LLrequestFloodSetSize( MutateSizeRHP pMutateSizeRHP, |
183 |
|
- |
int pRequestedSize ) |
|
179 |
+ |
protected final RenderProcessResult LLrequestFloodSetSize( MutateSizeRHP pMutateSizeRHP, int pRequestedSize ) |
184 |
180 |
|
{ |
185 |
181 |
|
mFloodSetSizePending = pRequestedSize; |
186 |
182 |
|
return LLprocessPendingSizeChange( pMutateSizeRHP ); |
187 |
183 |
|
} |
188 |
184 |
|
|
189 |
|
- |
protected final RenderProcessResult LLrequestAdjustSizeBy( MutateSizeRHP pMutateSizeRHP, |
190 |
|
- |
int pRequestedSizeChange ) |
|
185 |
+ |
protected final RenderProcessResult LLrequestAdjustSizeBy( MutateSizeRHP pMutateSizeRHP, int pRequestedSizeChange ) |
191 |
186 |
|
{ |
192 |
187 |
|
mAdjustSizeByPending = pRequestedSizeChange; |
193 |
188 |
|
return LLprocessPendingSizeChange( pMutateSizeRHP ); |
194 |
189 |
|
} |
195 |
190 |
|
|
196 |
|
- |
protected final RenderProcessResult LLrequestFloodAdjustSizeBy( MutateSizeRHP pMutateSizeRHP, |
197 |
|
- |
int pRequestedSizeChange ) |
|
191 |
+ |
protected final RenderProcessResult LLrequestFloodAdjustSizeBy( MutateSizeRHP pMutateSizeRHP, int pRequestedSizeChange ) |
198 |
192 |
|
{ |
199 |
193 |
|
mFloodAdjustSizeByPending = pRequestedSizeChange; |
200 |
194 |
|
return LLprocessPendingSizeChange( pMutateSizeRHP ); |
|
@@ -261,8 +255,7 @@ |
261 |
255 |
|
pLogger.log( "SizingError: ", this, " SizedTo ", pExpectedSize, ", but Current Size = ", pActualSize, pPlus ); |
262 |
256 |
|
} |
263 |
257 |
|
|
264 |
|
- |
private RenderProcessResult LLsetSize( MutateSizeRHP pMutateSizeRHP, int pCurrentSize, int pMinimumSize, |
265 |
|
- |
int pNewSize, boolean pExplicitlySized ) |
|
258 |
+ |
private RenderProcessResult LLsetSize( MutateSizeRHP pMutateSizeRHP, int pCurrentSize, int pMinimumSize, int pNewSize, boolean pExplicitlySized ) |
266 |
259 |
|
{ |
267 |
260 |
|
// Note: we will not be here unless ((mSizedTo == null) || (mSizedTo == pCurrentSize)) |
268 |
261 |
|
if ( pNewSize < pMinimumSize ) |
|
@@ -285,6 +278,5 @@ |
285 |
278 |
|
/** |
286 |
279 |
|
* Set the Size - pCurrentSize != pNewSize |
287 |
280 |
|
*/ |
288 |
|
- |
abstract protected RenderProcessResult LLLsetSize( MutateSizeRHP pMutateSizeRHP, int pCurrentSize, |
289 |
|
- |
int pNewSize ); |
|
281 |
+ |
abstract protected RenderProcessResult LLLsetSize( MutateSizeRHP pMutateSizeRHP, int pCurrentSize, int pNewSize ); |
290 |
282 |
|
} |