From 64a1713f528e1af1db404d09c3a0c2fd1df8f46e Mon Sep 17 00:00:00 2001 From: UNV Date: Tue, 10 Jun 2025 17:57:09 +0300 Subject: [PATCH] Replacing consulo.io.Size with Size2D. --- .../intellij/images/options/ZoomOptions.java | 6 ++--- .../awt/impl/editor/ImageEditorUI.java | 10 +++---- .../setting/ImagesOptionsConfigurable.java | 4 +-- .../images/impl/setting/ZoomOptionsImpl.java | 26 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/image-api/src/main/java/org/intellij/images/options/ZoomOptions.java b/image-api/src/main/java/org/intellij/images/options/ZoomOptions.java index f57b082..27b4ce3 100644 --- a/image-api/src/main/java/org/intellij/images/options/ZoomOptions.java +++ b/image-api/src/main/java/org/intellij/images/options/ZoomOptions.java @@ -15,7 +15,7 @@ */ package org.intellij.images.options; -import consulo.ui.Size; +import consulo.ui.Size2D; import jakarta.annotation.Nonnull; @@ -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); diff --git a/image-desktop-awt-impl/src/main/java/consulo/images/desktop/awt/impl/editor/ImageEditorUI.java b/image-desktop-awt-impl/src/main/java/consulo/images/desktop/awt/impl/editor/ImageEditorUI.java index bdff759..b96a0dd 100644 --- a/image-desktop-awt-impl/src/main/java/consulo/images/desktop/awt/impl/editor/ImageEditorUI.java +++ b/image-desktop-awt-impl/src/main/java/consulo/images/desktop/awt/impl/editor/ImageEditorUI.java @@ -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; @@ -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); } diff --git a/plugin/src/main/java/consulo/images/impl/setting/ImagesOptionsConfigurable.java b/plugin/src/main/java/consulo/images/impl/setting/ImagesOptionsConfigurable.java index 050ac83..895689e 100644 --- a/plugin/src/main/java/consulo/images/impl/setting/ImagesOptionsConfigurable.java +++ b/plugin/src/main/java/consulo/images/impl/setting/ImagesOptionsConfigurable.java @@ -121,7 +121,7 @@ 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) ); @@ -129,7 +129,7 @@ protected Component createLayout(@Nonnull PropertyBuilder propertyBuilder, @Nonn smartWheelPanel.add(LabeledBuilder.sided(ImagesLocalize.settingsPrefferedSmartZoomHeight(), smartZoomingHeight)); propertyBuilder.add( smartZoomingHeight, - () -> zoomOptions.getPrefferedSize().getHeight(), + () -> zoomOptions.getPrefferedSize().height(), it -> zoomOptions.setOption(ZoomOptions.ATTR_PREFFERED_HEIGHT, it) ); diff --git a/plugin/src/main/java/consulo/images/impl/setting/ZoomOptionsImpl.java b/plugin/src/main/java/consulo/images/impl/setting/ZoomOptionsImpl.java index e9b59ba..bc5f622 100644 --- a/plugin/src/main/java/consulo/images/impl/setting/ZoomOptionsImpl.java +++ b/plugin/src/main/java/consulo/images/impl/setting/ZoomOptionsImpl.java @@ -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; @@ -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) { @@ -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) { @@ -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) { @@ -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 @@ -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(); }