Update v1.2.8

iNKORE-NET · Jan 3, 2024 · 92ed7bf · 92ed7bf
1 parent 00947ca
commit 92ed7bf
Show file tree

Hide file tree

Showing 164 changed files with 380 additions and 1,078 deletions.
diff --git a/source/MCSkinn/Controls/UserControls/NewSkinDialogContent.xaml.cs b/source/MCSkinn/Controls/UserControls/NewSkinDialogContent.xaml.cs
@@ -1,7 +1,7 @@
 using iNKORE.Coreworks.Helpers;
 using iNKORE.Coreworks.Localization;
-using iNKORE.Coreworks.Windows.Presentation;
-using MCSkinn.Forms.Controls;
+using iNKORE.UI.WPF.Helpers;
+using MCSkinn.Controls;
 using MCSkinn.Scripts;
 using MCSkinn.Scripts.Paril.Imaging;
 using MCSkinn.Scripts.Paril.OpenGL;
@@ -320,7 +320,7 @@ public void TryGetModel()
 
             System.Drawing.Bitmap bmp = new System.Drawing.Bitmap(path);
 
-            Model model = Skin.TryGetModel(path, bmp, TreeView_Models.SelectedItem == null);
+            Model model = SkinNode.TryGetModel(path, bmp, TreeView_Models.SelectedItem == null);
 
             if (model != null)
             {

diff --git a/source/MCSkinn/Dialogs/AboutWindow.xaml b/source/MCSkinn/Dialogs/AboutWindow.xaml
diff --git a/source/MCSkinn/Dialogs/AboutWindow.xaml.cs b/source/MCSkinn/Dialogs/AboutWindow.xaml.cs
diff --git a/source/MCSkinn/Dialogs/GeneralQuestionDialog.xaml b/source/MCSkinn/Dialogs/GeneralQuestionDialog.xaml
diff --git a/source/MCSkinn/Dialogs/GeneralQuestionDialog.xaml.cs b/source/MCSkinn/Dialogs/GeneralQuestionDialog.xaml.cs
diff --git a/source/MCSkinn/Dialogs/LogWindow.xaml.cs b/source/MCSkinn/Dialogs/LogWindow.xaml.cs
@@ -7,7 +7,7 @@
 using System.Diagnostics;
 using MCSkinn.Scripts;
 using System;
-using iNKORE.Coreworks.Windows.Presentation;
+using iNKORE.UI.WPF.Helpers;
 
 namespace MCSkinn.Dialogs
 {

diff --git a/source/MCSkinn/Dialogs/SkinSizeMismatchDialug.xaml b/source/MCSkinn/Dialogs/SkinSizeMismatchDialug.xaml
diff --git a/source/MCSkinn/Dialogs/SkinSizeMismatchDialug.xaml.cs b/source/MCSkinn/Dialogs/SkinSizeMismatchDialug.xaml.cs
diff --git a/source/MCSkinn/Forms/Controls/ModelToolStripMenuItem.cs b/source/MCSkinn/Forms/Controls/ModelToolStripMenuItem.cs
diff --git a/source/MCSkinn/MCSkinnAppContext.cs b/source/MCSkinn/MCSkinnAppContext.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
-using MCSkinn.Forms;
 using MCSkinn.Scripts;
 
 namespace MCSkinn

diff --git a/source/MCSkinn/MainWindow.xaml b/source/MCSkinn/MainWindow.xaml
@@ -10,7 +10,7 @@
         ui:TitleBar.ExtendViewIntoTitleBar="True"    
         ui:TitleBar.IsBackButtonVisible="False"
         ui:TitleBar.Height="36"
-        WindowStartupLocation="CenterScreen" UseLayoutRounding="True" 
+        WindowStartupLocation="CenterScreen"
         Closing="Window_Closing" Loaded="Window_Loaded" Activated="Window_Activated" Deactivated="Window_Deactivated" BorderBrush="{DynamicResource {x:Static ui:ThemeKeys.WindowBorderKey}}" BorderThickness="1" Icon="/MCSkinn;component/Resources/Icons/MCSkinn.ico" KeyDown="Window_KeyDown" Initialized="Window_Initialized">
     <!--<WindowChrome.WindowChrome>
         <WindowChrome UseAeroCaptionButtons="False"/>

diff --git a/source/MCSkinn/MainWindow.xaml.cs b/source/MCSkinn/MainWindow.xaml.cs
@@ -1,5 +1,4 @@
 using MCSkinn.Dialogs;
-using MCSkinn.Forms.Controls;
 using MCSkinn.Scripts;
 using iNKORE.Coreworks.Localization;
 using MCSkinn.Scripts.Paril.OpenGL;
@@ -25,6 +24,7 @@
 using Microsoft.AppCenter.Crashes;
 using System.Windows.Media.Animation;
 using iNKORE.UI.WPF.Modern.Media.Animation;
+using iNKORE.UI.WPF.Modern.Controls.Helpers;
 
 namespace MCSkinn
 {
@@ -36,7 +36,7 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-            this.Title = "MCSkinn - Version " + Program.VersionFull;
+            this.Title = "MCSkinn - Version " + Program.Version;
 
             //Program.Page_Editor.TextBlock_User.Text = Environment.UserName;
 
@@ -85,14 +85,14 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
 
         private void Window_Activated(object sender, EventArgs e)
         {
-            if(!Program.IsNativeMicaSupported)
-                TitlebarOpacityAnimation(1d);
+            //if(!Program.IsNativeMicaSupported)
+            //    TitlebarOpacityAnimation(1d);
         }
 
         private void Window_Deactivated(object sender, EventArgs e)
         {
-            if (!Program.IsNativeMicaSupported)
-                TitlebarOpacityAnimation(0.45d);
+            //if (!Program.IsNativeMicaSupported)
+            //    TitlebarOpacityAnimation(0.45d);
         }
 
         public static Duration TitlebarOpacityAnimationDuration = new Duration(TimeSpan.FromMilliseconds(500));
@@ -133,14 +133,13 @@ private void Frame_Main_Navigated(object sender, NavigationEventArgs e)
 
         private void Window_KeyDown(object sender, KeyEventArgs e)
         {
-
         }
 
         private void Window_Initialized(object sender, EventArgs e)
         {
             if (!GlobalSettings.CompatibilityMode)
             {
-                iNKORE.UI.WPF.Modern.Controls.Primitives.WindowHelper.SetUseModernWindowStyle(this, true);
+                WindowHelper.SetUseModernWindowStyle(this, true);
             }
             else
             {