Skip to content

Replacing consulo.io.Size with Size2D #18

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
VISTALL merged 1 commit into from
Jun 10, 2025
Merged

Replacing consulo.io.Size with Size2D #18

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
6 changes: 3 additions & 3 deletions image-api/src/main/java/org/intellij/images/options/ZoomOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.intellij.images.options;

import consulo.ui.Size;
import consulo.ui.Size2D;

import jakarta.annotation.Nonnull;

Expand All @@ -31,14 +31,14 @@ public interface ZoomOptions extends Cloneable {
String ATTR_PREFFERED_WIDTH = ATTR_PREFIX + "prefferedWidth";
String ATTR_PREFFERED_HEIGHT = ATTR_PREFIX + "prefferedHeight";

Size DEFAULT_PREFFERED_SIZE = new Size(128, 128);
Size2D DEFAULT_PREFFERED_SIZE = new Size2D(128, 128);

boolean isWheelZooming();

boolean isSmartZooming();

@Nonnull
Size getPrefferedSize();
Size2D getPrefferedSize();

void inject(ZoomOptions options);

Expand Down
10 changes: 5 additions & 5 deletions ...-desktop-awt-impl/src/main/java/consulo/images/desktop/awt/impl/editor/ImageEditorUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import consulo.language.psi.PsiFile;
import consulo.language.psi.PsiManager;
import consulo.project.Project;
import consulo.ui.Size;
import consulo.ui.Size2D;
import consulo.ui.ex.CopyPasteSupport;
import consulo.ui.ex.CopyProvider;
import consulo.ui.ex.CutProvider;
Expand Down Expand Up @@ -569,10 +569,10 @@ private Double getSmartZoomFactor(@Nonnull ZoomOptions zoomOptions) {
}
int width = bounds.width, height = bounds.height;

Size preferredMinimumSize = zoomOptions.getPrefferedSize();
if (width < preferredMinimumSize.getWidth() && height < preferredMinimumSize.getHeight()) {
double factor = (preferredMinimumSize.getWidth() / (double)width +
preferredMinimumSize.getHeight() / (double)height) / 2.0d;
Size2D preferredMinimumSize = zoomOptions.getPrefferedSize();
if (width < preferredMinimumSize.width() && height < preferredMinimumSize.height()) {
double factor = (preferredMinimumSize.width() / (double)width +
preferredMinimumSize.height() / (double)height) / 2.0d;
return Math.ceil(factor);
}

Expand Down
4 changes: 2 additions & 2 deletions plugin/src/main/java/consulo/images/impl/setting/ImagesOptionsConfigurable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ protected Component createLayout(@Nonnull PropertyBuilder propertyBuilder, @Nonn
smartWheelPanel.add(LabeledBuilder.sided(ImagesLocalize.settingsPrefferedSmartZoomWidth(), smartZoomingWidth));
propertyBuilder.add(
smartZoomingWidth,
() -> zoomOptions.getPrefferedSize().getWidth(),
() -> zoomOptions.getPrefferedSize().width(),
it -> zoomOptions.setOption(ZoomOptions.ATTR_PREFFERED_WIDTH, it)
);

IntBox smartZoomingHeight = IntBox.create(1).withRange(1, 9999);
smartWheelPanel.add(LabeledBuilder.sided(ImagesLocalize.settingsPrefferedSmartZoomHeight(), smartZoomingHeight));
propertyBuilder.add(
smartZoomingHeight,
() -> zoomOptions.getPrefferedSize().getHeight(),
() -> zoomOptions.getPrefferedSize().height(),
it -> zoomOptions.setOption(ZoomOptions.ATTR_PREFFERED_HEIGHT, it)
);

Expand Down
26 changes: 13 additions & 13 deletions plugin/src/main/java/consulo/images/impl/setting/ZoomOptionsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package consulo.images.impl.setting;

import consulo.ui.Size;
import consulo.ui.Size2D;
import consulo.util.xml.serializer.JDOMExternalizable;
import consulo.util.xml.serializer.JDOMExternalizer;
import jakarta.annotation.Nonnull;
Expand All @@ -32,8 +32,8 @@
final class ZoomOptionsImpl implements ZoomOptions, JDOMExternalizable {
private boolean wheelZooming;
private boolean smartZooming = true;
private int prefferedWidth = DEFAULT_PREFFERED_SIZE.getWidth();
private int prefferedHeight = DEFAULT_PREFFERED_SIZE.getHeight();
private int prefferedWidth = DEFAULT_PREFFERED_SIZE.width();
private int prefferedHeight = DEFAULT_PREFFERED_SIZE.height();
private final PropertyChangeSupport propertyChangeSupport;

ZoomOptionsImpl(PropertyChangeSupport propertyChangeSupport) {
Expand All @@ -52,8 +52,8 @@ public boolean isSmartZooming() {

@Nonnull
@Override
public Size getPrefferedSize() {
return new Size(prefferedWidth, prefferedHeight);
public Size2D getPrefferedSize() {
return new Size2D(prefferedWidth, prefferedHeight);
}

void setWheelZooming(boolean wheelZooming) {
Expand All @@ -72,12 +72,12 @@ void setSmartZooming(boolean smartZooming) {
}
}

void setPrefferedSize(Size prefferedSize) {
void setPrefferedSize(Size2D prefferedSize) {
if (prefferedSize == null) {
prefferedSize = DEFAULT_PREFFERED_SIZE;
}
setPrefferedWidth(prefferedSize.getWidth());
setPrefferedHeight(prefferedSize.getHeight());
setPrefferedWidth(prefferedSize.width());
setPrefferedHeight(prefferedSize.height());
}

void setPrefferedWidth(int prefferedWidth) {
Expand Down Expand Up @@ -127,8 +127,8 @@ else if (ATTR_PREFFERED_HEIGHT.equals(name)) {
public void readExternal(Element element) {
setWheelZooming(JDOMExternalizer.readBoolean(element, ATTR_WHEEL_ZOOMING));
setSmartZooming(JDOMExternalizer.readBoolean(element, ATTR_SMART_ZOOMING));
setPrefferedWidth(JDOMExternalizer.readInteger(element, ATTR_PREFFERED_WIDTH, DEFAULT_PREFFERED_SIZE.getWidth()));
setPrefferedHeight(JDOMExternalizer.readInteger(element, ATTR_PREFFERED_HEIGHT, DEFAULT_PREFFERED_SIZE.getHeight()));
setPrefferedWidth(JDOMExternalizer.readInteger(element, ATTR_PREFFERED_WIDTH, DEFAULT_PREFFERED_SIZE.width()));
setPrefferedHeight(JDOMExternalizer.readInteger(element, ATTR_PREFFERED_HEIGHT, DEFAULT_PREFFERED_SIZE.height()));
}

@Override
Expand All @@ -150,9 +150,9 @@ public boolean equals(Object obj) {

ZoomOptions otherOptions = (ZoomOptions)obj;

Size prefferedSize = otherOptions.getPrefferedSize();
return prefferedHeight == prefferedSize.getHeight()
&& prefferedWidth == prefferedSize.getWidth()
Size2D prefferedSize = otherOptions.getPrefferedSize();
return prefferedHeight == prefferedSize.height()
&& prefferedWidth == prefferedSize.width()
&& smartZooming == otherOptions.isSmartZooming()
&& wheelZooming == otherOptions.isWheelZooming();
}
Expand Down
Loading