hide target = all in packagemanager

one-ware · Aug 8, 2024 · fe9d994 · fe9d994
1 parent 2f6b0de
commit fe9d994
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/OneWare.Essentials/PackageManager/PackageVersion.cs b/src/OneWare.Essentials/PackageManager/PackageVersion.cs
@@ -5,4 +5,6 @@ public class PackageVersion
     public string? Version { get; init; }
 
     public PackageTarget[]? Targets { get; init; }
+
+    public bool TargetAll => Targets is [{ Target: "all" }];
 }
diff --git a/src/OneWare.PackageManager/Views/PackageView.axaml b/src/OneWare.PackageManager/Views/PackageView.axaml
@@ -18,7 +18,7 @@
             <ItemsControl ItemsSource="{Binding Links}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" Spacing="5" />
+                        <StackPanel Orientation="Horizontal" Spacing="7" />
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.DataTemplates>
@@ -68,7 +68,7 @@
                 </StackPanel>
             </StackPanel>
 
-            <ItemsControl ItemsSource="{Binding SelectedVersion.Targets}">
+            <ItemsControl ItemsSource="{Binding SelectedVersion.Targets, FallbackValue={x:Null}}" IsVisible="{Binding !SelectedVersion.TargetAll, FallbackValue={x:False}}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <StackPanel Orientation="Horizontal" Spacing="5" />

diff --git a/src/OneWare.UniversalFpgaProjectSystem/Helpers/HardwareGuiCreator.cs b/src/OneWare.UniversalFpgaProjectSystem/Helpers/HardwareGuiCreator.cs
@@ -76,6 +76,10 @@ public static async Task<HardwareGuiViewModel> CreateGuiAsync(string guiPath, IH
                 var connectorStyle = element.TryGetProperty("connectorStyle", out var connectorStyleProperty)
                     ? connectorStyleProperty.GetString()
                     : "default";
+
+                var fontSize = element.TryGetProperty("fontSize", out var fontSizeProperty)
+                    ? fontSizeProperty.GetInt32()
+                    : 10;
 
                 switch (element.GetProperty("type").GetString()?.ToLower())
                 {
@@ -132,11 +136,7 @@ public static async Task<HardwareGuiViewModel> CreateGuiAsync(string guiPath, IH
                         var text = element.TryGetProperty("text", out var textProperty)
                             ? textProperty.GetString()
                             : null;
-
-                        var fontSize = element.TryGetProperty("fontSize", out var fontSizeProperty)
-                            ? fontSizeProperty.GetInt32()
-                            : 12;
-
+
                         vm.AddElement(new FpgaGuiElementRectViewModel(x, y, width, height)
                         {
                             Color = color,
@@ -232,6 +232,7 @@ public static async Task<HardwareGuiViewModel> CreateGuiAsync(string guiPath, IH
                                 FlipLabel = flipLabel,
                                 Parent = hardwareModel,
                                 Foreground = foreground,
+                                FontSize = fontSize,
                                 Rotation = isHorizontal ? 90 : 0
                             });
                         }
@@ -264,6 +265,7 @@ public static async Task<HardwareGuiViewModel> CreateGuiAsync(string guiPath, IH
                             Text = label,
                             FlipLabel = flipLabel,
                             Parent = hardwareModel,
+                            FontSize = fontSize,
                             Foreground = foreground
                         });
                         break;
@@ -281,10 +283,6 @@ public static async Task<HardwareGuiViewModel> CreateGuiAsync(string guiPath, IH
 
                         var text = element.GetProperty("text").GetString();
 
-                        var fontSize = element.TryGetProperty("fontSize", out var fontSizeProperty)
-                            ? fontSizeProperty.GetInt32()
-                            : 12;
-
                         vm.AddElement(new FpgaGuiElementTextViewModel(x, y)
                         {
                             Rotation = rotation,

diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPinView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPinView.axaml
@@ -12,7 +12,7 @@
         <RotateTransform Angle="{Binding Rotation}" />
     </UserControl.RenderTransform>
     <StackPanel Orientation="Horizontal" Margin="{Binding #Label.Bounds.Width, Converter={x:Static converters:UniversalFpgaProjectSystemConverters.HorizontalLabelMarginConverter}}">
-        <TextBlock IsVisible="{Binding !FlipLabel}" Padding="2 0" VerticalAlignment="Center" ClipToBounds="False" Name="Label" FontSize="{Binding Height}" Text="{Binding Text}" Foreground="{Binding Foreground}">
+        <TextBlock IsVisible="{Binding !FlipLabel}" Padding="2 0" VerticalAlignment="Center" ClipToBounds="False" Name="Label" FontSize="{Binding FontSize}" Text="{Binding Text}" Foreground="{Binding Foreground}">
             <Interaction.Behaviors>
                 <behaviors:ApplyAlternativeBindingIfNullBehavior OriginalValue="{Binding Foreground}" AlternativeValue="{DynamicResource ThemeForegroundBrush}" />
             </Interaction.Behaviors>
@@ -61,7 +61,7 @@
                 </DataTriggerBehavior>
             </Interaction.Behaviors>
         </Button>
-        <TextBlock IsVisible="{Binding FlipLabel}" Padding="2 0" VerticalAlignment="Center" ClipToBounds="False" Name="FlippedLabel" FontSize="{Binding Height}" Text="{Binding Text}" Foreground="{Binding Foreground}">
+        <TextBlock IsVisible="{Binding FlipLabel}" Padding="2 0" VerticalAlignment="Center" ClipToBounds="False" Name="FlippedLabel" Height="{Binding Height}" FontSize="{Binding FontSize}" Text="{Binding Text}" Foreground="{Binding Foreground}">
             <Interaction.Behaviors>
                 <behaviors:ApplyAlternativeBindingIfNullBehavior OriginalValue="{Binding Foreground}" AlternativeValue="{DynamicResource ThemeForegroundBrush}" />
             </Interaction.Behaviors>