diff --git a/AssetEditor/Language_En.json b/AssetEditor/Language_En.json
index 4f3d61061..22bbe25d9 100644
--- a/AssetEditor/Language_En.json
+++ b/AssetEditor/Language_En.json
@@ -11,5 +11,11 @@
"SettingsWindow.OnlyLoadLod0": "Only load Lod0 for reference meshes",
"SettingsWindow.GridSize": "Grid Size",
"SettingsWindow.AudioModding": "Audio Modding",
- "SettingsWindow.SaveButton": "Save"
+ "SettingsWindow.SaveButton": "Save",
+
+ "UpdaterWindow.Title": "Updater",
+ "UpdaterWindow.UpdateInfo": "A new version of AssetEditor is available!\n\nYour current version is {0}. Update to version {1} to get the latest changes detailed below.",
+ "UpdaterWindow.ReleaseNotes": "Release Notes",
+ "UpdaterWindow.UpdateButton": "Update",
+ "UpdaterWindow.CancelButton": "Cancel"
}
\ No newline at end of file
diff --git a/AssetEditor/Themes/ControlColours.xaml b/AssetEditor/Themes/ControlColours.xaml
index c52f49d34..70470f7e7 100644
--- a/AssetEditor/Themes/ControlColours.xaml
+++ b/AssetEditor/Themes/ControlColours.xaml
@@ -264,6 +264,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/AssetEditor/Themes/Controls.xaml b/AssetEditor/Themes/Controls.xaml
index fc35e6cda..58a4c3170 100644
--- a/AssetEditor/Themes/Controls.xaml
+++ b/AssetEditor/Themes/Controls.xaml
@@ -1,14 +1,16 @@
-
+
@@ -16,7 +18,7 @@
-
+
+
+
+
+
+
+
+
-
diff --git a/AssetEditor/Views/Updater/UpdaterWindow.xaml b/AssetEditor/Views/Updater/UpdaterWindow.xaml
index e1781fb56..3081e655f 100644
--- a/AssetEditor/Views/Updater/UpdaterWindow.xaml
+++ b/AssetEditor/Views/Updater/UpdaterWindow.xaml
@@ -4,6 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:Localisation="clr-namespace:Shared.Ui.Common;assembly=Shared.Ui"
xmlns:Updater="clr-namespace:AssetEditor.Views.Updater"
xmlns:MdXaml="clr-namespace:MdXaml;assembly=MdXaml"
xmlns:ViewModels="clr-namespace:AssetEditor.ViewModels"
@@ -13,9 +14,9 @@
Closed="OnClosed"
ResizeMode="NoResize"
WindowStartupLocation="CenterScreen"
- Height="545"
- Width="800"
- Title="Asset Editor Updater">
+ SizeToContent="Height"
+ Width="1000"
+ Title="{Localisation:Loc UpdaterWindow.Title}">
@@ -29,90 +30,82 @@
Height="Auto"/>
-
-
-
-
-
-
-
-
-
-
+ VerticalScrollBarVisibility="Auto"
+ MaxHeight="400"
+ Padding="0">
-
+
+
+
+
-
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ Margin="10, 10, 0, 0">
diff --git a/AssetEditor/Views/Updater/UpdaterWindow.xaml.cs b/AssetEditor/Views/Updater/UpdaterWindow.xaml.cs
index 70a04626a..76c3fe0e0 100644
--- a/AssetEditor/Views/Updater/UpdaterWindow.xaml.cs
+++ b/AssetEditor/Views/Updater/UpdaterWindow.xaml.cs
@@ -1,9 +1,11 @@
using System;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using AssetEditor.ViewModels;
+using MdXaml;
namespace AssetEditor.Views.Updater
{
@@ -51,6 +53,46 @@ private void OnWindowLoaded(object sender, RoutedEventArgs e)
viewModel.SetCloseAction(this.Close);
}
+ private void OnMarkdownScrollViewerLoaded(object sender, RoutedEventArgs e)
+ {
+ if (sender is not MarkdownScrollViewer markdownScrollViewer)
+ return;
+
+ var flowDocument = markdownScrollViewer.Document;
+ if (flowDocument == null)
+ return;
+
+ // We format the list manually as the Controls.xaml doesn't let you set MarkerStyle
+ // and the spacing before the list is too big but changing the margin of paragraph
+ // in Controls.xaml changes all blocks rather than just the block for lists.
+ FormatList(flowDocument);
+ }
+
+ private static void FormatList(FlowDocument flowDocument)
+ {
+ var currentBlock = flowDocument.Blocks.FirstBlock;
+
+ while (currentBlock != null)
+ {
+ var nextBlock = currentBlock.NextBlock;
+
+ if (currentBlock is List list)
+ {
+ list.MarkerStyle = TextMarkerStyle.Disc;
+ list.Margin = new Thickness(0);
+ list.Padding = new Thickness(list.Padding.Left, 0, list.Padding.Right, 0);
+
+ if (list.ListItems.FirstListItem?.Blocks.FirstBlock is Paragraph firstParagraph)
+ firstParagraph.Margin = new Thickness(firstParagraph.Margin.Left, 10, firstParagraph.Margin.Right, firstParagraph.Margin.Bottom);
+ }
+
+ if (currentBlock is Paragraph paragraph && nextBlock is List)
+ paragraph.Margin = new Thickness(paragraph.Margin.Left, paragraph.Margin.Top, paragraph.Margin.Right, 0);
+
+ currentBlock = nextBlock;
+ }
+ }
+
private void OnClosed(object sender, EventArgs e)
{
if (DataContext is UpdaterViewModel viewModel)
diff --git a/AssetEditor/WindowsTitleMenu/WindowStateToPathConverter.cs b/AssetEditor/WindowsTitleMenu/WindowStateToPathConverter.cs
index ddc0b27fc..2cffa826e 100644
--- a/AssetEditor/WindowsTitleMenu/WindowStateToPathConverter.cs
+++ b/AssetEditor/WindowsTitleMenu/WindowStateToPathConverter.cs
@@ -13,11 +13,11 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
var ws = (WindowState)value;
if (ws == WindowState.Normal)
{
- return Geometry.Parse("M 13.5,10.5 H 22.5 V 19.5 H 13.5 Z");
+ return Geometry.Parse("M 18.5,10.5 H 27.5 V 19.5 H 18.5 Z");
}
else
{
- return Geometry.Parse("M 13.5,12.5 H 20.5 V 19.5 H 13.5 Z M 15.5,12.5 V 10.5 H 22.5 V 17.5 H 20.5");
+ return Geometry.Parse("M 18.5,12.5 H 25.5 V 19.5 H 18.5 Z M 20.5,12.5 V 10.5 H 27.5 V 17.5 H 25.5");
}
}