From ef3e4f957bafc5fe97185d5caa718a3358be6e23 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 27 Jun 2023 14:34:37 +0200
Subject: [PATCH] Fix obj SVG x buttons parametrico

---
 Resources/ChangeLog.html                          |  2 +-
 Resources/VersNum.txt                             |  2 +-
 Resources/manifest.xml                            |  2 +-
 .../Components/SvgComp/HwSvgObj.razor             | 12 ++++++------
 .../Components/SvgComp/HwSvgObj.razor.cs          | 10 ++++++++++
 WebDoorCreator.UI/Pages/TestPage.razor            | 15 +++++++++------
 WebDoorCreator.UI/WebDoorCreator.UI.csproj        |  2 +-
 7 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 75e0e06..96b3409 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2306.2712</h4>
+    <h4>Version: 0.9.2306.2714</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 03aee9e..364ad9a 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2306.2712
+0.9.2306.2714
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 5e7589f..c33efb7 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2306.2712</version>
+  <version>0.9.2306.2714</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor
index 38ebac5..d815ca3 100644
--- a/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor
+++ b/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor
@@ -1,7 +1,7 @@
 ﻿<svg viewBox="0 0 @ObjW @ObjH" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
     <g transform="translate(0,@LineDist)">
         <foreignObject width="@TextAreaWidth" height="100%">
-            <div class="d-flex justify-content-between rectangle p-3 @cardClass" style="@TextStyle;" @onclick="() => doExecFunc(ActionReq.Select, false)">
+            <div class="d-flex justify-content-between rectangle p-3 @cardClass @TextCss" style="@TextStyle;" @onclick="() => doExecFunc(ActionReq.Select, false)">
                 <div>
                     @ItemName
                 </div>
@@ -21,15 +21,15 @@
     <circle id="circleLine" cx="@CircleLine.cx" cy="@CircleLine.cy" r="@CircleLine.rad" stroke="@LineColor" stroke-width="@LineWidth" fill="blue" />
     <defs>
         <pattern id="@($"contImg_{ObjId}")" patternContentUnits="userSpaceOnUse" width="1" height="1">
-            <linearGradient id="BckGrad" x1="0" x2="0" y1="0" y2="1">
-                <stop offset="0%" stop-color="#AFCFD1" />
-                <stop offset="100%" stop-color="#92B2C4" />
+            <linearGradient id="@($"BckGrad_{ObjId}")" x1="0" x2="0" y1="0" y2="1">
+                <stop offset="0%" stop-color="@BgColorFrom" />
+                <stop offset="100%" stop-color="@BgColorTo" />
             </linearGradient>
-            <rect fill="url(#BckGrad)" x="0" y="0" height="100%" width="100%" style="opacity: 100%;"></rect>
+            <rect fill="url(#@($"BckGrad_{ObjId}"))" x="0" y="0" height="100%" width="100%" style="opacity: 100%;"></rect>
             <image x="@(CircleImg.rad/2)" y="0" href="@ImagePath" width="@CircleImg.rad" height="100%"></image>
             @if (ShowPlus)
             {
-                <rect x="0" y="0" width="100%" height="100%" fill="@PlusColor" style="opacity: 30%;" />
+                <rect x="0" y="0" width="100%" height="100%" fill="@PlusColor" style="opacity: @PlusOpacity;" />
             }
         </pattern>
     </defs>
diff --git a/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor.cs b/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor.cs
index 42dc8eb..d9d6096 100644
--- a/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor.cs
+++ b/WebDoorCreator.UI/Components/SvgComp/HwSvgObj.razor.cs
@@ -59,6 +59,16 @@ namespace WebDoorCreator.UI.Components.SvgComp
         [Parameter]
         public string TextStyle { get; set; } = "font-size: 2.5em;";
 
+        [Parameter]
+        public string TextCss { get; set; } = "text-dark";
+
+        [Parameter]
+        public string PlusOpacity { get; set; } = "30%";
+        [Parameter]
+        public string BgColorFrom { get; set; } = "#AFCFD1";
+        [Parameter]
+        public string BgColorTo { get; set; } = "#92B2C4";
+
         #endregion Public Properties
 
         #region Protected Properties
diff --git a/WebDoorCreator.UI/Pages/TestPage.razor b/WebDoorCreator.UI/Pages/TestPage.razor
index a63964f..b4d4985 100644
--- a/WebDoorCreator.UI/Pages/TestPage.razor
+++ b/WebDoorCreator.UI/Pages/TestPage.razor
@@ -49,16 +49,19 @@
 </div>
 
 <div class="row my-2">
-    <div class="col-3">
+    <div class="col">
         <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="21" ItemName="Flush Pull" ItemCount="2" ImagePath="@svgUrl(196)"></HwSvgObj>
     </div>
-    <div class="col-3">
-        <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="22" ItemName="Hinge" ItemCount="0" ImagePath="images/icons/ExitWhite.svg"></HwSvgObj>
+    <div class="col">
+        <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="22" ItemName="Hinge" ItemCount="0" ImagePath="images/icons/ExitWhite.svg" TextCss="text-secondary"></HwSvgObj>
     </div>
-    <div class="col-3">
-        <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="23" ItemName="Hinge" ItemCount="0" ImagePath="images/icons/PlusWhite.svg" ShowPlus="true"></HwSvgObj>
+    <div class="col">
+        <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="23" ItemName="HingeSel" ItemCount="0" ImagePath="images/icons/PlusWhite.svg" ShowPlus="false" BgColorFrom="#339833" BgColorTo="#98FF98"></HwSvgObj>
     </div>
-    <div class="col-3">
+    <div class="col">
+        <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="25" ItemName="HingePlus" ItemCount="0" ImagePath="images/icons/PlusWhite.svg" ShowPlus="true"></HwSvgObj>
+    </div>
+    <div class="col">
         <HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@exeFun" ObjId="24" ItemName="Hinge" ItemCount="0" ShowPlus="true" ImagePath="@svgUrl(186)"></HwSvgObj>
     </div>
 </div>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index ab9ff2e..30d1b09 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2306.2712</Version>
+        <Version>0.9.2306.2714</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
