Handle aspect ratio for ImageVectorIcon rendering

Author: egorikftp

components/ir/api/ir.api

@@ -116,6 +116,10 @@ public final class io/github/composegears/valkyrie/ir/IrImageVector {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class io/github/composegears/valkyrie/ir/IrImageVectorKt {
+	public static final fun getAspectRatio (Lio/github/composegears/valkyrie/ir/IrImageVector;)F
+}
+
 public final class io/github/composegears/valkyrie/ir/IrPathFillType : java/lang/Enum {
 	public static final field EvenOdd Lio/github/composegears/valkyrie/ir/IrPathFillType;
 	public static final field NonZero Lio/github/composegears/valkyrie/ir/IrPathFillType;

components/ir/api/ir.klib.api

@@ -658,5 +658,8 @@ final object io.github.composegears.valkyrie.ir.util/ColorClassification { // io
     final fun from(kotlin.collections/List<io.github.composegears.valkyrie.ir/IrColor>): io.github.composegears.valkyrie.ir.util/DominantShade // io.github.composegears.valkyrie.ir.util/ColorClassification.from|from(kotlin.collections.List<io.github.composegears.valkyrie.ir.IrColor>){}[0]
 }
 
+final val io.github.composegears.valkyrie.ir/aspectRatio // io.github.composegears.valkyrie.ir/aspectRatio|@io.github.composegears.valkyrie.ir.IrImageVector{}aspectRatio[0]
+    final fun (io.github.composegears.valkyrie.ir/IrImageVector).<get-aspectRatio>(): kotlin/Float // io.github.composegears.valkyrie.ir/aspectRatio.<get-aspectRatio>|<get-aspectRatio>@io.github.composegears.valkyrie.ir.IrImageVector(){}[0]
+
 final fun (io.github.composegears.valkyrie.ir/IrImageVector).io.github.composegears.valkyrie.ir.util/iconColors(): kotlin.collections/List<io.github.composegears.valkyrie.ir/IrColor> // io.github.composegears.valkyrie.ir.util/iconColors|[email protected](){}[0]
 final fun (kotlin/Char).io.github.composegears.valkyrie.ir.util/toPathNodes(kotlin/FloatArray): kotlin.collections/List<io.github.composegears.valkyrie.ir/IrPathNode> // io.github.composegears.valkyrie.ir.util/toPathNodes|[email protected](kotlin.FloatArray){}[0]

components/ir/src/commonMain/kotlin/io/github/composegears/valkyrie/ir/IrImageVector.kt

@@ -9,3 +9,10 @@ data class IrImageVector(
     val viewportHeight: Float,
     val nodes: List<IrVectorNode>,
 )
+
+val IrImageVector.aspectRatio: Float
+    get() = if (viewportHeight != 0f && viewportWidth != 0f) {
+        viewportWidth / viewportHeight
+    } else {
+        1f
+    }

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/completion/ImageVectorCompletionContributor.kt

@@ -9,6 +9,7 @@ import com.intellij.codeInsight.lookup.LookupElementPresentation
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import io.github.composegears.valkyrie.extensions.safeAs
+import io.github.composegears.valkyrie.ir.aspectRatio
 import io.github.composegears.valkyrie.ir.xml.toVectorXmlString
 import io.github.composegears.valkyrie.psi.imagevector.ImageVectorPsiParser
 import javax.swing.Icon
@@ -58,11 +59,13 @@ class ImageVectorCompletionContributor : CompletionContributor() {
     }
 
     private fun createIconFromKtFile(ktFile: KtFile): Icon? {
-        val vectorXml = ImageVectorPsiParser.parseToIrImageVector(ktFile)
-            ?.toVectorXmlString()
-            ?: return null
+        val irImageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)
+        val vectorXml = irImageVector?.toVectorXmlString() ?: return null
 
-        return ImageVectorIcon(vectorXml = vectorXml)
+        return ImageVectorIcon(
+            vectorXml = vectorXml,
+            aspectRatio = irImageVector.aspectRatio,
+        )
     }
 
     private class ComposeColorLookupElementDecorator(

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/completion/ImageVectorIcon.kt

@@ -11,6 +11,7 @@ import javax.swing.Icon
 class ImageVectorIcon(
     private val vectorXml: String,
     private val size: Int = 16,
+    private val aspectRatio: Float,
 ) : Icon {
 
     @Volatile
@@ -23,7 +24,18 @@ class ImageVectorIcon(
             cachedImage = renderImage()
         }
         val img = cachedImage ?: return
-        g.drawImage(img, x, y, size, size, null)
+
+        // Calculate dimensions preserving aspect ratio
+        val (width, height) = when {
+            aspectRatio > 1f -> size to (size / aspectRatio).toInt()
+            else -> (size * aspectRatio).toInt() to size
+        }
+
+        // Center the icon if it's smaller than the allocated space
+        val offsetX = x + (size - width) / 2
+        val offsetY = y + (size - height) / 2
+
+        g.drawImage(img, offsetX, offsetY, width, height, null)
     }
 
     private fun renderImage(): Image? {

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/gutter/ImageVectorGutterProvider.kt

@@ -12,6 +12,7 @@ import com.intellij.psi.util.CachedValuesManager
 import io.github.composegears.valkyrie.completion.ImageVectorIcon
 import io.github.composegears.valkyrie.extensions.safeAs
 import io.github.composegears.valkyrie.ir.IrImageVector
+import io.github.composegears.valkyrie.ir.aspectRatio
 import io.github.composegears.valkyrie.ir.xml.toVectorXmlString
 import io.github.composegears.valkyrie.psi.imagevector.ImageVectorPsiParser
 import javax.swing.Icon
@@ -83,7 +84,10 @@ class ImageVectorGutterProvider : LineMarkerProvider {
         val irImageVector = parseImageVectorProperty(this) ?: return null
         val vectorXml = irImageVector.toVectorXmlString()
 
-        return ImageVectorIcon(vectorXml = vectorXml)
+        return ImageVectorIcon(
+            vectorXml = vectorXml,
+            aspectRatio = irImageVector.aspectRatio,
+        )
     }
 
     private fun parseImageVectorProperty(property: KtProperty): IrImageVector? {