Skip to content

[GEF] SideLocator should extend RelativeLocator directly #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Jul 29, 2026
Merged

[GEF] SideLocator should extend RelativeLocator directly #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions org.eclipse.wb.core/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,18 @@
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java" type="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy">
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy"/>
<message_argument value="createMoveHandle()"/>
</message_arguments>
</filter>
<filter id="576720909">
<message_arguments>
<message_argument value="SelectionEditPolicy"/>
<message_argument value="AbstractGridSelectionEditPolicy"/>
</message_arguments>
</filter>
</resource>
</component>
19 changes: 9 additions & 10 deletions ....core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridSelectionEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.eclipse.wb.core.model.IAbstractComponentInfo;
import org.eclipse.wb.core.model.ObjectInfo;
import org.eclipse.wb.core.model.broadcast.ObjectEventListener;
import org.eclipse.wb.draw2d.AbstractRelativeLocator;
import org.eclipse.wb.draw2d.RelativeLocator;
import org.eclipse.wb.gef.core.IEditPartViewer;
import org.eclipse.wb.gef.graphical.handles.MoveHandle;
import org.eclipse.wb.gef.graphical.handles.SquareHandle;
Expand All @@ -33,6 +31,7 @@
import org.eclipse.draw2d.Locator;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.RelativeLocator;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Interval;
import org.eclipse.draw2d.geometry.Point;
Expand Down Expand Up @@ -592,13 +591,13 @@ protected Color getBorderColor() {
protected final Locator createComponentLocator(int direction, double percent) {
IFigure reference = getHostFigure();
if (direction == PositionConstants.WEST) {
return new RelativeLocator(reference, 0, percent);
return new org.eclipse.wb.draw2d.RelativeLocator(reference, 0, percent);
} else if (direction == PositionConstants.EAST) {
return new RelativeLocator(reference, 1, percent);
return new org.eclipse.wb.draw2d.RelativeLocator(reference, 1, percent);
} else if (direction == PositionConstants.NORTH) {
return new RelativeLocator(reference, percent, percent);
return new org.eclipse.wb.draw2d.RelativeLocator(reference, percent, percent);
} else if (direction == PositionConstants.SOUTH) {
return new RelativeLocator(reference, percent, 1);
return new org.eclipse.wb.draw2d.RelativeLocator(reference, percent, 1);
}
throw new IllegalArgumentException("Unknown direction: " + direction);
}
Expand All @@ -607,14 +606,14 @@ protected final Locator createComponentLocator(int direction, double percent) {
* @return {@link Locator} that positions handles on component's cells side.
*/
protected final Locator createCellLocator(int direction, double percent) {
class SideLocator extends AbstractRelativeLocator {
class SideLocator extends RelativeLocator {
public SideLocator(double relativeX, double relativeY) {
super(relativeX, relativeY);
super(getHost().getFigure(), relativeX, relativeY);
}

@Override
protected Rectangle getReferenceRectangle() {
return getComponentCellBounds_atFeedback();
protected Rectangle getReferenceBox() {
return getComponentCellBounds();
}
}
//
Expand Down
Loading