From 372f5971e8389b90f47ebb2eb2d86e2b20dbf990 Mon Sep 17 00:00:00 2001
From: anoshenko <anoshenko@gmail.com>
Date: Sun, 23 Apr 2023 12:49:32 +0300
Subject: [PATCH] Fixed SvgImageView

---
 svgImageView.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/svgImageView.go b/svgImageView.go
index ed49fa9..f2a6c7f 100644
--- a/svgImageView.go
+++ b/svgImageView.go
@@ -3,6 +3,7 @@ package rui
 import (
 	"io"
 	"net/http"
+	"os"
 	"strings"
 )
 
@@ -107,8 +108,21 @@ func (imageView *svgImageViewData) htmlTag() string {
 func (imageView *svgImageViewData) htmlSubviews(self View, buffer *strings.Builder) {
 	if value := imageView.getRaw(Content); value != nil {
 		if content, ok := value.(string); ok && content != "" {
-			if image, ok := resources.images[content]; ok && image.fs != nil {
-				if data, err := image.fs.ReadFile(image.path); err == nil {
+			if strings.HasPrefix(content, "@") {
+				if name, ok := imageView.session.ImageConstant(content[1:]); ok {
+					content = name
+				}
+			}
+
+			if image, ok := resources.images[content]; ok {
+				if image.fs != nil {
+					if data, err := image.fs.ReadFile(image.path); err == nil {
+						buffer.WriteString(string(data))
+						return
+					} else {
+						DebugLog(err.Error())
+					}
+				} else if data, err := os.ReadFile(image.path); err == nil {
 					buffer.WriteString(string(data))
 					return
 				} else {