up render

Author: Coloryr

MinecraftSkinRender

@@ -874,7 +874,7 @@
 	"SkinWindow.Text6": "显示披风",
 	"SkinWindow.Text7": "行走动画",
 	"SkinWindow.Text8": "重置动作",
-	"SkinWindow.Text9": "MSAA x4抗锯齿",
+	"SkinWindow.Text9": "抗锯齿",
 	"SkinWindow.Text10": "菜单",
 	"SkinWindow.Text11": "没有皮肤文件",
 	"SkinWindow.Info1": "你不能选择该类型",

src/ColorMC.Gui/Resource/Language/gui_zh-cn.json

@@ -235,9 +235,9 @@ public HeadControl()
             StackPanel1.Children.Add(_buttonMax);
             StackPanel1.Children.Add(_buttonClose);
 
-            //Win32Properties.SetNonClientHitTestResult(_buttonMax, Win32Properties.Win32HitTestValue.MaxButton);
-            //Win32Properties.SetNonClientHitTestResult(_buttonMin, Win32Properties.Win32HitTestValue.MinButton);
-            //Win32Properties.SetNonClientHitTestResult(_buttonClose, Win32Properties.Win32HitTestValue.Close);
+            Win32Properties.SetNonClientHitTestResult(_buttonMax, Win32Properties.Win32HitTestValue.MaxButton);
+            Win32Properties.SetNonClientHitTestResult(_buttonMin, Win32Properties.Win32HitTestValue.MinButton);
+            Win32Properties.SetNonClientHitTestResult(_buttonClose, Win32Properties.Win32HitTestValue.Close);
         }
 
         _buttonMin.Click += ButtonMin_Click;

src/ColorMC.Gui/UI/Controls/HeadControl.axaml.cs

@@ -55,9 +55,9 @@ private void Model_PropertyChanged(object? sender, PropertyChangedEventArgs e)
         {
             skin.EnableTop = model.EnableTop;
         }
-        else if (e.PropertyName == nameof(SkinModel.EnableMSAA))
+        else if (e.PropertyName == nameof(SkinModel.EnableFXAA))
         {
-            //skin.SetMSAA(model.EnableMSAA);
+            skin.RenderType = model.EnableFXAA ? SkinRenderType.FXAA : SkinRenderType.Normal;
         }
         else if (e.PropertyName == SkinModel.RotateName)
         {

src/ColorMC.Gui/UI/Controls/Skin/OpenGL/SkinRender.cs

@@ -10,7 +10,7 @@
     d:DesignWidth="800"
     x:DataType="model:SkinModel"
     mc:Ignorable="d">
-    <ScrollViewer Margin="15">
+    <ScrollViewer Width="150" Margin="15">
         <StackPanel>
             <UniformGrid>
                 <Button
@@ -20,8 +20,7 @@
                     Classes="top"
                     Command="{Binding Load}"
                     Content="{setting:Localize Button.Refash}"
-                    ToolTip.Tip="{setting:Localize ToolTip.Text14}"
-                     />
+                    ToolTip.Tip="{setting:Localize ToolTip.Text14}" />
                 <Button
                     Height="35"
                     Margin="0,0,-2,0"
@@ -30,17 +29,15 @@
                     Command="{Binding ResetPos}"
                     Content="{setting:Localize SkinWindow.Text1}"
                     IsEnabled="{Binding HaveSkin}"
-                    ToolTip.Tip="{setting:Localize ToolTip.Text15}"
-                     />
+                    ToolTip.Tip="{setting:Localize ToolTip.Text15}" />
                 <Button
                     Height="35"
                     Margin="-2,0,0,0"
                     HorizontalAlignment="Stretch"
                     Classes="top"
                     Command="{Binding Edit}"
                     Content="{setting:Localize SkinWindow.Text3}"
-                    ToolTip.Tip="{setting:Localize ToolTip.Text16}"
-                     />
+                    ToolTip.Tip="{setting:Localize ToolTip.Text16}" />
                 <Button
                     Height="35"
                     Margin="0,0,-2,0"
@@ -49,8 +46,7 @@
                     Command="{Binding Save}"
                     Content="{setting:Localize SkinWindow.Text4}"
                     IsEnabled="{Binding HaveSkin}"
-                    ToolTip.Tip="{setting:Localize ToolTip.Text17}"
-                     />
+                    ToolTip.Tip="{setting:Localize ToolTip.Text17}" />
             </UniformGrid>
             <StackPanel IsEnabled="{Binding HaveSkin}">
                 <ComboBox
@@ -75,7 +71,7 @@
                     OnContent="{setting:Localize SkinWindow.Text7}" />
                 <ToggleSwitch
                     Margin="0,0,0,-5"
-                    IsChecked="{Binding EnableMSAA}"
+                    IsChecked="{Binding EnableFXAA}"
                     OffContent="{setting:Localize SkinWindow.Text9}"
                     OnContent="{setting:Localize SkinWindow.Text9}" />
                 <StackPanel IsEnabled="{Binding !EnableAnimation}">
@@ -107,8 +103,7 @@
                         Classes="top"
                         Command="{Binding Reset}"
                         Content="{setting:Localize SkinWindow.Text8}"
-                        ToolTip.Tip="{setting:Localize ToolTip.Text18}"
-                         />
+                        ToolTip.Tip="{setting:Localize ToolTip.Text18}" />
                 </StackPanel>
             </StackPanel>
         </StackPanel>

src/ColorMC.Gui/UI/Controls/Skin/SkinSideControl.axaml

@@ -79,10 +79,10 @@ public partial class SkinModel(BaseModel model) : TopModel(model)
     [ObservableProperty]
     private bool _enableZ;
     /// <summary>
-    /// 是否启用MSAA
+    /// 是否启用FXAA
     /// </summary>
     [ObservableProperty]
-    private bool _enableMSAA = false;
+    private bool _enableFXAA = false;
 
     /// <summary>
     /// 皮肤类型