diff --git a/ToolsForm/.idea/.idea.ToolsForm/.idea/projectSettingsUpdater.xml b/ToolsForm/.idea/.idea.ToolsForm/.idea/projectSettingsUpdater.xml index 4bb9f4d..64af657 100644 --- a/ToolsForm/.idea/.idea.ToolsForm/.idea/projectSettingsUpdater.xml +++ b/ToolsForm/.idea/.idea.ToolsForm/.idea/projectSettingsUpdater.xml @@ -1,6 +1,7 @@ - \ No newline at end of file diff --git a/ToolsForm/.idea/.idea.ToolsForm/.idea/workspace.xml b/ToolsForm/.idea/.idea.ToolsForm/.idea/workspace.xml index 1758deb..b224fbf 100644 --- a/ToolsForm/.idea/.idea.ToolsForm/.idea/workspace.xml +++ b/ToolsForm/.idea/.idea.ToolsForm/.idea/workspace.xml @@ -8,17 +8,10 @@ - - - - - - + - - @@ -27,6 +20,12 @@ + + + + + + - - { "customColor": "", "associatedIndex": 1 @@ -88,13 +84,6 @@ "发布到文件夹.Publish ToolsForm to folder (1).executor": "Run", "发布到文件夹.Publish ToolsForm to folder (2).executor": "Run", "发布到文件夹.Publish ToolsForm to folder.executor": "Run" - }, - "keyToStringList": { - "rider.external.source.directories": [ - "C:\\Users\\PC\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\DecompilerCache", - "C:\\Users\\PC\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\SourcesCache", - "C:\\Users\\PC\\AppData\\Local\\Symbols\\src" - ] } }]]> @@ -152,6 +141,7 @@ + diff --git a/ToolsForm/ToolsForm/Manager/AppWindowManager.cs b/ToolsForm/ToolsForm/Manager/AppWindowManager.cs index e198889..99093cf 100644 --- a/ToolsForm/ToolsForm/Manager/AppWindowManager.cs +++ b/ToolsForm/ToolsForm/Manager/AppWindowManager.cs @@ -34,6 +34,7 @@ namespace ToolsForm.Models public static UploadExperimentWindow? UploadExperimentWindow; //暂存 public static UploadExperimentMessageWindow? UploadExperimentMessageWindow; //暂存 public static AIWindow? AiWindow; //AI + public static ExperimentWindow2? ExperimentWindow2; //切换窗口 /// /// 创建窗口 diff --git a/ToolsForm/ToolsForm/Views/ExperimentWindow2.axaml b/ToolsForm/ToolsForm/Views/ExperimentWindow2.axaml new file mode 100644 index 0000000..083c16b --- /dev/null +++ b/ToolsForm/ToolsForm/Views/ExperimentWindow2.axaml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ToolsForm/ToolsForm/Views/ExperimentWindow2.axaml.cs b/ToolsForm/ToolsForm/Views/ExperimentWindow2.axaml.cs new file mode 100644 index 0000000..d7a6d4e --- /dev/null +++ b/ToolsForm/ToolsForm/Views/ExperimentWindow2.axaml.cs @@ -0,0 +1,259 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Markup.Xaml; +using Avalonia.VisualTree; +using ToolsForm.Models; +using ToolsForm.ViewModels; +using ToolsForm.Views.TemporaryStorage; + +namespace ToolsForm.Views; + + + +public partial class ExperimentWindow2 : Window +{ + private ExperimentWindowViewModel ViewModel; + private bool _isHovering = false; + private bool _isClicked = false; + private ButtonState _currentState = ButtonState.Default; + + public ExperimentWindow2() + { + InitializeComponent(); + PositionChanged += OnPositionChanged; + PointerPressed += MainWindow_PointerPressed; + PointerPressed += ExperimentWindow_PointerReleased; + Topmost = true; + + + ViewModel = new ExperimentWindowViewModel(); + DataContext = ViewModel; // 设置 DataContext + var experimentButton = this.FindControl