From 90bf911d525e4887af0d64941127e84cd6cdef43 Mon Sep 17 00:00:00 2001 From: Andre Dietisheim Date: Wed, 2 Oct 2024 22:14:15 +0200 Subject: [PATCH] fix: replaced helm png by svg, use resized, not scaled icon (#874) (#920) Signed-off-by: Andre Dietisheim --- .../tree/application/DescriptorFactory.java | 11 +- .../openshift/ui/helm/ChartIcons.java | 6 +- src/main/resources/images/helm/helm.png | Bin 2196 -> 0 bytes src/main/resources/images/helm/helm.svg | 131 +++++++++--------- 4 files changed, 77 insertions(+), 71 deletions(-) delete mode 100644 src/main/resources/images/helm/helm.png diff --git a/src/main/java/org/jboss/tools/intellij/openshift/tree/application/DescriptorFactory.java b/src/main/java/org/jboss/tools/intellij/openshift/tree/application/DescriptorFactory.java index 064896931..6eeed6c3d 100644 --- a/src/main/java/org/jboss/tools/intellij/openshift/tree/application/DescriptorFactory.java +++ b/src/main/java/org/jboss/tools/intellij/openshift/tree/application/DescriptorFactory.java @@ -13,8 +13,10 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.IconLoader; +import com.intellij.util.IconUtil; import com.redhat.devtools.intellij.common.tree.LabelAndIconDescriptor; -import org.jboss.tools.intellij.openshift.ui.SwingUtils; +import java.util.function.Supplier; +import javax.swing.Icon; import org.jboss.tools.intellij.openshift.ui.helm.ChartIcons; import org.jboss.tools.intellij.openshift.utils.odo.Binding; import org.jboss.tools.intellij.openshift.utils.odo.Component; @@ -23,9 +25,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.Icon; -import java.util.function.Supplier; - public class DescriptorFactory { private static final Supplier CLUSTER_ICON = () -> IconLoader.findIcon("/images/cluster.svg", ApplicationsTreeStructure.class); @@ -161,7 +160,7 @@ public class DescriptorFactory { releaseNode, releaseNode::getName, () -> "Helm Release", - () -> SwingUtils.scaleIcon(ICON_WIDTH, ChartIcons.getIcon(releaseNode.getRelease())), + () -> IconUtil.resizeSquared(ChartIcons.getIcon(releaseNode.getRelease()), ICON_WIDTH), parentDescriptor); } else if (element instanceof HelmRepositoriesNode) { HelmRepositoriesNode helmRepositoriesNode = (HelmRepositoriesNode) element; @@ -170,7 +169,7 @@ public class DescriptorFactory { helmRepositoriesNode, helmRepositoriesNode::getName, () -> "Repositories", - () -> SwingUtils.scaleIcon(ICON_WIDTH, ChartIcons.getHelmIcon()), + () -> IconUtil.resizeSquared(ChartIcons.getHelmIcon(), ICON_WIDTH), parentDescriptor); } else if (element instanceof HelmRepositoryNode) { HelmRepositoryNode helmRepositoryNode = (HelmRepositoryNode) element; diff --git a/src/main/java/org/jboss/tools/intellij/openshift/ui/helm/ChartIcons.java b/src/main/java/org/jboss/tools/intellij/openshift/ui/helm/ChartIcons.java index 43afa2bbb..ae26b50d8 100644 --- a/src/main/java/org/jboss/tools/intellij/openshift/ui/helm/ChartIcons.java +++ b/src/main/java/org/jboss/tools/intellij/openshift/ui/helm/ChartIcons.java @@ -22,9 +22,10 @@ public class ChartIcons { private static final Path BASE_PATH = Paths.get("images", "helm"); - private static final String HELM_ICON = "helm.png"; + private static final String HELM_ICON = "helm.svg"; public static Icon getHelmIcon() { + // IC-2023.3: IconManager.getInstance().getIcon(BASE_PATH.resolve(HELM_ICON_SVG).toString(), ChartIcons.class.getClassLoader()) return IconManager.getInstance().getIcon(BASE_PATH.resolve(HELM_ICON).toString(), ChartIcons.class); } @@ -41,8 +42,9 @@ private static Icon getIcon(String name) { .filter((IconExpression available) -> available.isMatching(name)) .findFirst(); return found + // IC-2023.3: IconManager.getInstance().getIcon(BASE_PATH.resolve(HELM_ICON_SVG).toString(), ChartIcons.class.getClassLoader()) .map(iconExpression -> IconManager.getInstance().getIcon(iconExpression.filename, ChartIcons.class)) - .orElseGet(ChartIcons::getHelmIcon); + .orElseGet(ChartIcons::getHelmIcon); } private enum IconExpression { diff --git a/src/main/resources/images/helm/helm.png b/src/main/resources/images/helm/helm.png deleted file mode 100644 index 3e5981e3903136a11f9c6a06a8abc72e258cc27b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2196 zcmV;F2y6F=P)EX>4Tx062|}Rb6NtRTMs(xw9)I&V$sZrjic+HI%e$QqhFk=>BE1ZQLxAY_vg; z$?V;oX(lt{{G@3qJ`_O^!KmPq;Qw2}Cn0L9?Tam?khm;cmfj@-EE=vY<#k5o0f^m&*sM6pBI0EL{uRZtU4R5Z`^X8`V)zNfJ8YaF z;u6EP09P2E5Ad?jnUOMxUqvh^s*L``+lU9}BlcPZ2XpY-jyyG}ttleQMaed+noc9r zy@UIIwng1*#M^^UkFzj+6yF25_LnMhmf?pGpH<}CbcnAmX|u%;|7E#p3GpKUUAw%6 zatiT2#A8)^yd3Cssj4^8z$>TJnP(8+gLrkpJj%xIMEtceUz`eceo~wa<_{hK;NmJR zuzL3+9o0iVC08s$)vACv7|KExH6jmbd4gn8^0FkllzkRT6fd|P0nrwSVAXrbt(XrcJk z;OyVRDf#{Yw^VBW$m{6QFhZvPBk<6w!tZERBfJcLd1$M3&)TehHS09YRtkN(Z(GDi^F2;vKBX;HY+Q*UEnTqUvgh@A9J5aYSek}G;8j!qp=F+X_rylpF&#L zEj%b>g+0Q~5^H*5N-?MwSLA ze5T{?GXqX;9WfX;*4pXw6&V*io?m|<6;W0GAb4f<-njQ>$>Q>9MPr@wU=n+0I+*9IKpp9 z{{0u*d8K7@p9VPmCp-6AwmA>rtOL;dXv;Q$XXCx^0IWWyc=l3wC&Xgk0yx!!!@*Zi z8qcdA>-AfBZYACT*nGWS|NH%Vee(m<-vGFv{{#OecniJJ&By=%00v@9M??Ss00000 z`9r&Z00009a7bBm001r{001r{0eGc9b^rhX2XskIMF-~!4GtG9LW+c$0000PbVXQn zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbQ?ny*JR7l6Yms@CDMHt6_-?nL_ zrJl`&bDES!Ni0^OipH9UdU?=R?Sm4rrLD!6YNYxk(hL+tsfIEMctKEFMDS8b4H^NmD9~8J-ZPHhGD)l-~7Ls?=t@*RM66qUgI1` zfh(<1zm%h!sszwEwgL6P_HuPA0t8n2vAJBu#l?ak)OQ0Lfd{NnqZJxNI?_$f@wf>6 z*^D|kC!oL*2b+PmAk?kasPUQ=-AkQw?ar|YSPQK7%iDucUkJPhykLzQ@kTdzA2&J2 zK+*nZx4Oojx?FDNTc8FQ0EU3wKy8A9y$W;!PXn6(BSK3yqfX5U=q=n19Gqj*W5ACh zOgTq0u%^hEKY?WcDUodxnaRJMeHH;8bbbKG74 z6XCUDu#zXNZRn2jdG`^}1UTT~>Lv1+`L)v}2$bub<3->CFWPF2Iy7%u&)_&av^WL8x2(nh#>~$*QW<&C}B}8>~?S zL8yo4ENvxPYY^(f$*-|Sy&wD56$`F7AmgLEr~CtORxRxS#$vKv!0$zVh_~+k6G(Oz22P(wmW0uK5NvLM1Vo4w*ZGqRV+_2jsvHFOML;ai>;XgmipVe zEt^q;^8%(Lz1%r|_9W_ce?^_Z`3Xss@+9h(QY5NG(8vxCHX_1KYgCsAt3=od^!d}} z3hyoO4zO3C*&20+HR^j2?(uOD;%J|jL^=`Z+jbfHmsg z5>#U}9qH?x<5^c!n`Z%9qYeNE7Ml3kjQYu6>wofZ@tYri_+NfzMCb*^Qz_{!SN9)P WH*K_od^IWn0000 + inkscape:current-layer="g12" /> @@ -52,65 +52,70 @@ - - + - - + id="path3" + style="stroke-width:0.935414" /> + + + + + + + d="m 251.46701,173.09985 c -20.23008,-33.60997 -56.88957,-56.06791 -98.75578,-56.06791 -40.7208,0 -76.515877,21.2459 -97.058696,53.33459 m 2.198111,129.16953 c 20.840303,30.2327 55.555905,50.02659 94.860585,50.02659 39.3761,0 74.14642,-19.86588 94.97405,-50.19149" + mask="url(#a)" + stroke="#0f1689" + stroke-width="20" + id="path7" /> - - - + transform="matrix(0.87499999,0,0,1,11.92319,1.4460715e-7)" + id="g11"> + + + + + - - + d="m 251.46701,170.64039 c -20.23008,-33.60997 -56.88957,-56.06791 -98.75578,-56.06791 -40.7208,0 -76.515877,21.2459 -97.058696,53.33459 m 2.198111,129.16953 c 20.840303,30.2327 55.555905,50.02659 94.860585,50.02659 39.3761,0 74.14642,-19.86588 94.97405,-50.19149" + mask="url(#b)" + stroke="#0f1689" + stroke-width="20" + id="path11" /> -