Merge pull request #26 from atticus-lv/develop

Develop
atticus-lv · Dec 4, 2024 · e9c9d6d · e9c9d6d
2 parents 8fd121c + cf27ce3
commit e9c9d6d
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 30 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,9 +2,8 @@
 
 on:
   push:
-    branches: [ "master" ]
-    paths-ignore:
-      - 'README.md'
+    tags:
+      - 'v*.*.*'
 
 
 jobs:

diff --git a/src/VirtualStreetSnap/ViewModels/MainWindowViewModel.cs b/src/VirtualStreetSnap/ViewModels/MainWindowViewModel.cs
@@ -19,7 +19,7 @@ public partial class MainWindowViewModel : ViewModelBase
     private PagesModel? _currentPage;
 
     [ObservableProperty]
-    private bool _isPaneOpen;
+    private bool _isPaneOpen = true;
 
     [RelayCommand]
     public void TogglePane() => IsPaneOpen = !IsPaneOpen;

diff --git a/src/VirtualStreetSnap/ViewModels/SettingsViewModel.cs b/src/VirtualStreetSnap/ViewModels/SettingsViewModel.cs
@@ -13,7 +13,6 @@ namespace VirtualStreetSnap.ViewModels;
 
 public partial class SettingsViewModel : ViewModelBase
 {
-
     [ObservableProperty]
     private AppConfig _config = ConfigService.Instance;
 
@@ -53,6 +52,7 @@ partial void OnSelectedLanguageChanged(LanguageModel value)
 
     public async Task ChangeDir(string parmName)
     {
+        var oldValue = SaveDirectory;
         var task = parmName switch
         {
             "SaveDirectory" => this.ChangeDirectory(value => SaveDirectory = value,
@@ -61,8 +61,11 @@ public async Task ChangeDir(string parmName)
         };
         await task;
         // save the config
-        Config.Settings.SaveDirectory = SaveDirectory;
-        NotifyHelper.Notify(this, Localizer.Localizer.Instance["ConfigChanged"],
-            SaveDirectory);
+        if (oldValue != SaveDirectory)
+        {
+            Config.Settings.SaveDirectory = SaveDirectory;
+            NotifyHelper.Notify(this, Localizer.Localizer.Instance["ConfigChanged"],
+                SaveDirectory);
+        }
     }
 }
diff --git a/src/VirtualStreetSnap/Views/MainWindow.axaml b/src/VirtualStreetSnap/Views/MainWindow.axaml
@@ -30,6 +30,7 @@
         <Style Selector="Button#CloseWindowButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="Firebrick" />
         </Style>
+        <!-- footer -->
         <Style Selector="StackPanel#Footer">
             <Setter Property="Transitions">
                 <Transitions>
@@ -53,7 +54,7 @@
                                 <ListBox Width="40"
                                          ItemsSource="{Binding Pages}"
                                          SelectedItem="{Binding CurrentPage}"
-                                         CornerRadius="4">
+                                         CornerRadius="10">
 
                                     <ListBox.ItemsPanel>
                                         <ItemsPanelTemplate>
@@ -62,7 +63,8 @@
                                     </ListBox.ItemsPanel>
                                     <ListBox.ItemTemplate>
                                         <DataTemplate DataType="{x:Type vm:PagesModel}">
-                                            <StackPanel Spacing="5" ToolTip.Tip="{Binding Name,
+                                            <StackPanel Spacing="5"
+                                                        ToolTip.Tip="{Binding Name,
                                                                                    Converter={StaticResource LocalizeConverter}}">
                                                 <PathIcon Data="{Binding ItemIcon}">
                                                 </PathIcon>
@@ -92,26 +94,28 @@
             </SplitView.Pane>
 
             <SplitView.Content>
-                <Panel>
-                    <!-- <Rectangle Fill="Red" Width="25" HorizontalAlignment="Right"></Rectangle> -->
-                    <TransitioningContentControl Content="{Binding CurrentPage.Page}">
-                        <TransitioningContentControl.PageTransition>
-                            <PageSlide Orientation="Vertical" Duration="0:00:00.2" />
-                        </TransitioningContentControl.PageTransition>
-                    </TransitioningContentControl>
-                    <Button Name="TogglePaneButton" Content=">" HorizontalAlignment="Right" Height="120" Width="20"
-                            VerticalContentAlignment="Center" Margin="10" CornerRadius="10"
-                            Command="{Binding TogglePane}">
-                    </Button>
-                </Panel>
+                <!-- <Rectangle Fill="Red" Width="25" HorizontalAlignment="Right"></Rectangle> -->
+                <TransitioningContentControl Content="{Binding CurrentPage.Page}">
+                    <TransitioningContentControl.PageTransition>
+                        <PageSlide Orientation="Vertical" Duration="0:00:00.2" />
+                    </TransitioningContentControl.PageTransition>
+                </TransitioningContentControl>
             </SplitView.Content>
         </SplitView>
-        <Button Name="CloseWindowButton" VerticalAlignment="Top" HorizontalAlignment="Right"
-                HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
-                Background="Transparent" Width="40" Height="40" Margin="0 5 5 0 "
-                Command="{Binding OnCloseButtonClick}">
-            <TextBlock Text="X" FontSize="16" />
-        </Button>
+
+        <StackPanel VerticalAlignment="Top" HorizontalAlignment="Right">
+            <Button Name="CloseWindowButton"
+                    HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
+                    Background="Transparent" Width="40" Height="40" Margin="0 5 5 0 "
+                    Command="{Binding OnCloseButtonClick}">
+                <TextBlock Text="X" FontSize="16" />
+            </Button>
+            <ToggleButton Name="ToggleTopMost" Width="40" Height="40" CornerRadius="10"
+                          HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Click="ToggleTopMost_OnClick">
+                <PathIcon Data="{StaticResource PinRegular}"></PathIcon>
+            </ToggleButton>
+        </StackPanel>
+
 
     </Panel>
 </Window>
diff --git a/src/VirtualStreetSnap/Views/MainWindow.axaml.cs b/src/VirtualStreetSnap/Views/MainWindow.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 
 namespace VirtualStreetSnap.Views;
 
@@ -21,4 +22,9 @@ private void DragMoveWindow_PointerPressed(object? sender, PointerPressedEventAr
         if (!Equals(e.Source, ToolBar)) return;
         BeginMoveDrag(e);
     }
+
+    private void ToggleTopMost_OnClick(object? sender, RoutedEventArgs e)
+    {
+        Topmost = !Topmost;
+    }
 }
diff --git a/src/VirtualStreetSnap/Views/SnapShotView.axaml b/src/VirtualStreetSnap/Views/SnapShotView.axaml
@@ -59,7 +59,7 @@
             <Rectangle Name="CaptureArea"></Rectangle>
         </Border>
 
-        <StackPanel VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="20" Spacing="10"
+        <StackPanel VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0 0 20 20" Spacing="10"
                     Orientation="Horizontal">
 
             <Button Background="Transparent">

diff --git a/src/VirtualStreetSnap/VirtualStreetSnap.csproj b/src/VirtualStreetSnap/VirtualStreetSnap.csproj
@@ -15,7 +15,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <Version>0.1.2</Version>
+        <Version>0.1.3</Version>
         <Authors>Atticus</Authors>
         <Description>A simple screen shot tool design for VirtualStreetSnap</Description>
     </PropertyGroup>