v0.6.4

d3ara1n · Jun 29, 2024 · 7bc9464 · 7bc9464
1 parent 5cd0d3c
commit 7bc9464
Show file tree

Hide file tree

Showing 116 changed files with 2,547 additions and 1,776 deletions.
diff --git a/changelogs/v0.6.md b/changelogs/v0.6.md
@@ -21,8 +21,18 @@
 
 ## v0.6.3
 
-- **新增**默认全局字体替换为Outfit
+- **新增**默认全局字体替换为 Outfit
 - **新增**应用内提示将会自动淡出(除了警告和错误级别)
 - **修复**实例备注现在会随着内容超出显示区域而提供滚动能力
 
-## ---
+## v0.6.4
+
+- **修复**全局设置 JVM 附加参数过长不再引起布局问题
+- **优化**实例元数据中附件的名字会用省略号做截断
+- **优化**增加对内嵌资源与引用资源重复时的鲁棒处理(点名批评AOF7内嵌着色器包同时还引用了一次)
+- **修复**在线附件编辑页面会在安装新附件后立刻标记列表中的同一个附件的安装状态
+- **新增**实例元数据中附件可以就地修改版本
+
+## ---
+
+- **修复**实例元数据中附件就地修改版本后立刻更新列表中同一个附件的版本
diff --git a/src/Polymerium.App/App.xaml b/src/Polymerium.App/App.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <Application
     x:Class="Polymerium.App.App"
@@ -7,9 +7,9 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!-- 上一个版本的资源字典无法找到资源的原因找到了 -->
-                <!-- 资源字典单元素优化会丢失其他资源 -->
-                <!-- https://github.com/microsoft/microsoft-ui-xaml/issues/4811#issuecomment-819916453 -->
+                <!--  上一个版本的资源字典无法找到资源的原因找到了  -->
+                <!--  资源字典单元素优化会丢失其他资源  -->
+                <!--  https://github.com/microsoft/microsoft-ui-xaml/issues/4811#issuecomment-819916453  -->
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="ms-appx:///Themes/Generic.xaml" />
                 <ResourceDictionary Source="ms-appx:///Themes/Fonts.xaml" />

diff --git a/src/Polymerium.App/App.xaml.cs b/src/Polymerium.App/App.xaml.cs
@@ -14,9 +14,12 @@
 using Polymerium.Trident.Extractors;
 using Polymerium.Trident.Repositories;
 using Polymerium.Trident.Services;
+using System;
+using System.IO;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading;
 using Windows.Graphics;
 using Windows.Storage;
 
@@ -38,7 +41,7 @@ public App()
             Provider = services.BuildServiceProvider();
         }
 
-        public static new App Current => (App)Application.Current;
+        public static App Current => (App)Application.Current;
 
         public IServiceProvider Provider { get; }
 

diff --git a/src/Polymerium.App/Controls/Card.xaml b/src/Polymerium.App/Controls/Card.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -12,7 +12,7 @@
     <Thickness x:Key="CardContentMargin">15</Thickness>
     <Thickness x:Key="CardContentUpperMargin">15,15,15,0</Thickness>
 
-    <Style TargetType="local:Card" BasedOn="{StaticResource DefaultCardStyle}" />
+    <Style BasedOn="{StaticResource DefaultCardStyle}" TargetType="local:Card" />
 
     <Style x:Key="DefaultCardStyle" TargetType="local:Card">
         <Setter Property="CornerRadius" Value="{StaticResource CardSmallCornerRadius}" />
@@ -27,13 +27,14 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:Card">
-                    <Border CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}"
-                            Background="{TemplateBinding Background}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                        <ContentPresenter Margin="{TemplateBinding Padding}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}" />
+                    <Border
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{TemplateBinding ContentTemplate}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/src/Polymerium.App/Controls/CardButton.xaml b/src/Polymerium.App/Controls/CardButton.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -8,7 +8,7 @@
     <Thickness x:Key="CardButtonHighlightBorderThickness">3</Thickness>
     <SolidColorBrush x:Key="CardButtonHighlightBorderBrush" Color="{ThemeResource SystemAccentColor}" />
 
-    <Style TargetType="local:CardButton" BasedOn="{StaticResource DefaultCardButtonStyle}" />
+    <Style BasedOn="{StaticResource DefaultCardButtonStyle}" TargetType="local:CardButton" />
 
     <Style x:Key="DefaultCardButtonStyle" TargetType="local:CardButton">
         <Setter Property="CornerRadius" Value="{StaticResource CardSmallCornerRadius}" />
@@ -24,30 +24,31 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:CardButton">
                     <Grid>
+                        <Border
+                            x:Name="PART_Border"
+                            BorderThickness="{ThemeResource CardButtonHighlightBorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                            <Border
+                                Margin="{ThemeResource CardButtonHighlightBorderThickness}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                                <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            </Border>
+                        </Border>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="Common">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="PART_Border.BorderBrush"
-                                                Value="{ThemeResource CardButtonHighlightBorderBrush}" />
+                                        <Setter Target="PART_Border.BorderBrush" Value="{ThemeResource CardButtonHighlightBorderBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="PART_Border" CornerRadius="{TemplateBinding CornerRadius}"
-                                BorderThickness="{ThemeResource CardButtonHighlightBorderThickness}">
-                            <Border CornerRadius="{TemplateBinding CornerRadius}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    Background="{TemplateBinding Background}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Margin="{ThemeResource CardButtonHighlightBorderThickness}">
-                                <ContentPresenter Margin="{TemplateBinding Padding}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            </Border>
-                        </Border>
                     </Grid>
 
                 </ControlTemplate>

diff --git a/src/Polymerium.App/Controls/ClipBox.xaml b/src/Polymerium.App/Controls/ClipBox.xaml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Polymerium.App.Controls">
 
-    <Style TargetType="local:ClipBox" BasedOn="{StaticResource DefaultClipBoxStyle}" />
+    <Style BasedOn="{StaticResource DefaultClipBoxStyle}" TargetType="local:ClipBox" />
 
     <Style x:Key="DefaultClipBoxStyle" TargetType="local:ClipBox">
         <Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
@@ -17,23 +17,31 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ClipBox">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Background="{TemplateBinding Background}"
-                            CornerRadius="{TemplateBinding CornerRadius}">
+                    <Border
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <ContentPresenter Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
-                            <Button Grid.Column="1" Margin="1" VerticalAlignment="Stretch"
-                                    Padding="{TemplateBinding Padding}" Command="{TemplateBinding Command}"
-                                    CommandParameter="{TemplateBinding CommandParameter}">
-                                <FontIcon Glyph="&#xE8C8;" FontSize="{StaticResource ButtonFontIconFontSize}" />
+                            <ContentPresenter
+                                Grid.Column="0"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            <Button
+                                Grid.Column="1"
+                                Margin="1"
+                                Padding="{TemplateBinding Padding}"
+                                VerticalAlignment="Stretch"
+                                Command="{TemplateBinding Command}"
+                                CommandParameter="{TemplateBinding CommandParameter}">
+                                <FontIcon FontSize="{StaticResource ButtonFontIconFontSize}" Glyph="&#xE8C8;" />
                             </Button>
                         </Grid>
                     </Border>

diff --git a/src/Polymerium.App/Controls/DashBorder.xaml b/src/Polymerium.App/Controls/DashBorder.xaml
@@ -1,23 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Polymerium.App.Controls">
 
-    <Style TargetType="local:DashBorder" BasedOn="{StaticResource DefaultDashBorderStyle}" />
+    <Style BasedOn="{StaticResource DefaultDashBorderStyle}" TargetType="local:DashBorder" />
 
     <Style x:Key="DefaultDashBorderStyle" TargetType="local:DashBorder">
         <Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:DashBorder">
                     <Grid Background="{TemplateBinding Background}">
-                        <Rectangle Fill="Transparent" RadiusX="6" RadiusY="6" StrokeDashArray="8 4"
-                                   Stroke="{TemplateBinding BorderBrush}"
-                                   StrokeThickness="2" />
-                        <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          Margin="{TemplateBinding Padding}" />
+                        <Rectangle
+                            Fill="Transparent"
+                            RadiusX="6"
+                            RadiusY="6"
+                            Stroke="{TemplateBinding BorderBrush}"
+                            StrokeDashArray="8 4"
+                            StrokeThickness="2" />
+                        <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{TemplateBinding ContentTemplate}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/src/Polymerium.App/Controls/DragDropArea.xaml b/src/Polymerium.App/Controls/DragDropArea.xaml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Polymerium.App.Controls">
 
-    <Style TargetType="local:DragDropArea" BasedOn="{StaticResource DefaultDragDropAreaStyle}" />
+    <Style BasedOn="{StaticResource DefaultDragDropAreaStyle}" TargetType="local:DragDropArea" />
 
     <Style x:Key="DefaultDragDropAreaStyle" TargetType="local:DragDropArea">
         <Setter Property="BorderBrush" Value="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" />
@@ -16,6 +16,20 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:DragDropArea">
                     <Grid Background="{TemplateBinding Background}">
+                        <Rectangle
+                            x:Name="PART_Border"
+                            Fill="Transparent"
+                            Opacity="0.3"
+                            RadiusX="6"
+                            RadiusY="6"
+                            Stroke="{TemplateBinding BorderBrush}"
+                            StrokeDashArray="8 4"
+                            StrokeThickness="2">
+                            <Rectangle.OpacityTransition>
+                                <ScalarTransition />
+                            </Rectangle.OpacityTransition>
+                        </Rectangle>
+                        <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{TemplateBinding ContentTemplate}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="Common">
                                 <VisualState x:Name="Normal" />
@@ -26,16 +40,6 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Rectangle Fill="Transparent" x:Name="PART_Border" StrokeDashArray="8 4" RadiusX="6"
-                                   RadiusY="6"
-                                   Stroke="{TemplateBinding BorderBrush}"
-                                   StrokeThickness="2" Opacity="0.3">
-                            <Rectangle.OpacityTransition>
-                                <ScalarTransition />
-                            </Rectangle.OpacityTransition>
-                        </Rectangle>
-                        <ContentPresenter Margin="{TemplateBinding Padding}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>