litesoft
Diff Revisions
49
vs
151
for /trunk/Java/core/Anywhere/src/org/litesoft/uipopupsupport/ContextPopupPositioner.java
|
@@ -10,14 +10,11 @@ |
10 |
10 |
|
{ |
11 |
11 |
|
protected static final Logger LOGGER = LoggerFactory.getLogger( ContextPopupPositioner.class ); |
12 |
12 |
|
|
13 |
|
- |
public ContextPopupPositioner( RectangleContainmentStrategy pRectangleContainmentStrategy, |
14 |
|
- |
CommonRectangularPoint pPopupRelativeMeetingPoint, // |
|
13 |
+ |
public ContextPopupPositioner( RectangleContainmentStrategy pRectangleContainmentStrategy, CommonRectangularPoint pPopupRelativeMeetingPoint, // |
15 |
14 |
|
PointXY pClientPos, SizeXY pClientSize ) |
16 |
15 |
|
{ |
17 |
|
- |
UtilsCommon.assertNotNull( "RectangleContainmentStrategy", |
18 |
|
- |
mRectangleContainmentStrategy = pRectangleContainmentStrategy ); |
19 |
|
- |
UtilsCommon.assertNotNull( "PopupRelativeMeetingPoint", |
20 |
|
- |
mPopupRelativeMeetingPoint = pPopupRelativeMeetingPoint ); |
|
16 |
+ |
UtilsCommon.assertNotNull( "RectangleContainmentStrategy", mRectangleContainmentStrategy = pRectangleContainmentStrategy ); |
|
17 |
+ |
UtilsCommon.assertNotNull( "PopupRelativeMeetingPoint", mPopupRelativeMeetingPoint = pPopupRelativeMeetingPoint ); |
21 |
18 |
|
UtilsCommon.assertNotNull( "ClientPos", mClientPos = pClientPos ); |
22 |
19 |
|
UtilsCommon.assertNotNull( "ClientSize", mClientSize = pClientSize ); |
23 |
20 |
|
} |
|
@@ -62,7 +59,6 @@ |
62 |
59 |
|
PointXY zNewPopupPos = new PointXY( pRelativeTo.getX() - zPopupMeetingPointOffsets.getX(), // |
63 |
60 |
|
pRelativeTo.getY() - zPopupMeetingPointOffsets.getY() ); |
64 |
61 |
|
|
65 |
|
- |
return mRectangleContainmentStrategy.adjustToFitIn( new Rect( zNewPopupPos, pPopupRect.getSizeXY() ), |
66 |
|
- |
new Rect( PointXY.ZERO_ZERO, mClientSize ) ); |
|
62 |
+ |
return mRectangleContainmentStrategy.adjustToFitIn( new Rect( zNewPopupPos, pPopupRect.getSizeXY() ), new Rect( PointXY.ZERO_ZERO, mClientSize ) ); |
67 |
63 |
|
} |
68 |
64 |
|
} |