MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[followup] Add/refactor JBUI.JBIcon/ScalableJBIcon/ValidatingScalableJBIcon

Browse Source
This commit is contained in:
Anton Tarasov
2016-10-28 18:36:59 +03:00
parent 1f99e078e7
commit a88ce281ad
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/ui/LayeredIcon.java
+2 -2
View File
@@ -271,9 +271,9 @@ public class LayeredIcon extends JBUI.AuxScalableJBIcon {
@Override
public Icon scale(float scale) {
if (scale == 1f) return this;
if (scale == getScale()) return this;
setScale(scaleVal(scale, Scale.ARBITRARY));
setScale(scale);
if (myScaledIcons != null) Arrays.fill(myScaledIcons, null);
return this;
}
platform/core-api/src/com/intellij/ui/RowIcon.java
+2 -2
View File
@@ -57,9 +57,9 @@ public class RowIcon extends JBUI.AuxScalableJBIcon {
@Override
public Icon scale(float scale) {
if (scale == 1f) return this;
if (scale == getScale()) return this;
setScale(scaleVal(scale, Scale.ARBITRARY));
setScale(scale);
rescale();
return this;
}
platform/platform-api/src/com/intellij/ui/SizedIcon.java
+3 -3
View File
@@ -58,11 +58,11 @@ public class SizedIcon extends JBUI.ScalableJBIcon {
@Override
public Icon scale(float scale) {
if (scale == 1f) return this;
if (scale == getScale()) return this;
if (myDelegate instanceof ScalableIcon) {
setScale(scaleVal(scale, Scale.ARBITRARY));
myScaledDelegate = ((ScalableIcon)myDelegate).scale(getScale());
setScale(scale);
myScaledDelegate = ((ScalableIcon)myDelegate).scale(scale);
}
return this;
}
platform/util/src/com/intellij/openapi/util/IconLoader.java
+3 -3
View File
@@ -580,12 +580,12 @@ public final class IconLoader {
@Override
public Icon scale(float scale) {
if (scale == 1f) return this;
if (scale == getScale()) return this;
getOrComputeIcon();
if (myIcon instanceof ScalableIcon) {
setScale(scaleVal(scale, Scale.ARBITRARY));
myIcon = ((ScalableIcon)myIcon).scale(getScale());
setScale(scale);
myIcon = ((ScalableIcon)myIcon).scale(scale);
}
return this;
}