Skip to content

[GEF] Remove IPreferredSizeProvider in TopFigure #1663

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

Open
ptziegler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[GEF] Remove IPreferredSizeProvider in TopFigure #1663

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
23 changes: 3 additions & 20 deletions org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/DesignRootEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
import org.eclipse.wb.internal.core.model.DesignRootObject;
import org.eclipse.wb.internal.core.model.nonvisual.NonVisualBeanInfo;
import org.eclipse.wb.internal.draw2d.FigureCanvas;
import org.eclipse.wb.internal.draw2d.IPreferredSizeProvider;

import org.eclipse.draw2d.Border;
import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.MarginBorder;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.EditPart;
Expand Down Expand Up @@ -153,14 +152,15 @@ public EditPart getJavaRootEditPart() {
@Override
protected IFigure createFigure() {
IFigure figure = new TopFigure();
figure.setLayoutManager(new StackLayout());
figure.setBorder(DESIGN_MARGIN);
return figure;
}

/**
* Special {@link IFigure} that cover full area of parent.
*/
private static final class TopFigure extends Figure implements IPreferredSizeProvider {
private static final class TopFigure extends Figure {
////////////////////////////////////////////////////////////////////////////
//
// Figure
Expand All @@ -182,22 +182,5 @@ public boolean useLocalCoordinates() {
// location as they are all relative to the root component.
return true;
}

////////////////////////////////////////////////////////////////////////////
//
// IPreferredSizeProvider
//
////////////////////////////////////////////////////////////////////////////
@Override
public Dimension getPreferredSize(Dimension originalPreferredSize) {
Rectangle preferred = new Rectangle();
for (IFigure figure : getChildren()) {
if (figure.isVisible()) {
preferred.union(figure.getBounds());
}
}
preferred.expand(getInsets());
return preferred.getSize();
}
}
}
28 changes: 0 additions & 28 deletions org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/IPreferredSizeProvider.java
View file
Open in desktop

This file was deleted.

28 changes: 3 additions & 25 deletions org.eclipse.wb.core/src-draw2d/org/eclipse/wb/internal/draw2d/RootFigure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
public class RootFigure extends Figure implements IRootFigure {
private Dimension m_preferredSize;
private Map<Object, Layer> m_nameToLayer = new HashMap<>();
private IPreferredSizeProvider m_preferredSizeProvider;

////////////////////////////////////////////////////////////////////////////
//
Expand All @@ -43,19 +42,6 @@ public RootFigure() {
setLayoutManager(new StackLayout());
}

////////////////////////////////////////////////////////////////////////////
//
// Access
//
////////////////////////////////////////////////////////////////////////////

/**
* Sets figure preferred size provider.
*/
public void setPreferredSizeProvider(IPreferredSizeProvider provider) {
m_preferredSizeProvider = provider;
}

////////////////////////////////////////////////////////////////////////////
//
// RootFigure
Expand All @@ -76,21 +62,13 @@ public Dimension getPreferredSize(int wHint, int hHint) {
// figure's loop
for (IFigure figure : layer.getChildren()) {
if (figure.isVisible()) {
if (figure instanceof IPreferredSizeProvider provider) {
Dimension figurePreferredSize = provider.getPreferredSize(null);
preferred.union(0, 0, figurePreferredSize.width, figurePreferredSize.height);
} else {
preferred.union(figure.getBounds());
}
Rectangle figureBounds = new Rectangle(figure.getLocation(), figure.getPreferredSize(wHint, hHint));
preferred.union(figureBounds);
}
}
}
// set preferred size
if (m_preferredSizeProvider == null) {
m_preferredSize = preferred.getSize();
} else {
m_preferredSize = m_preferredSizeProvider.getPreferredSize(preferred.getSize());
}
m_preferredSize = preferred.getSize();
}
return m_preferredSize;
}
Expand Down
Loading