From 095ff99cf9c82674e5fe4f2103ed90dea15f9df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=BA=D0=BE=D0=B2=20=D0=A0=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BD?= <mr.pytkov@gmail.com>
Date: Thu, 4 Jun 2026 20:42:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=83=D0=B3=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LinuxEnvironmentVariableStore.cs          |   2 -
 src/Sms.TaskTwo.Avalonia/App.axaml            |  17 ++-
 src/Sms.TaskTwo.Avalonia/AppResources.cs      |   6 +
 .../Views/MainWindow.axaml                    | 142 ++++++++++--------
 src/Sms.TaskTwo.Core/AppResources.cs          |   6 -
 5 files changed, 96 insertions(+), 77 deletions(-)
 create mode 100644 src/Sms.TaskTwo.Avalonia/AppResources.cs
 delete mode 100644 src/Sms.TaskTwo.Core/AppResources.cs

diff --git a/src/Sms.Environment.Linux/LinuxEnvironmentVariableStore.cs b/src/Sms.Environment.Linux/LinuxEnvironmentVariableStore.cs
index cbfd938..4718d63 100644
--- a/src/Sms.Environment.Linux/LinuxEnvironmentVariableStore.cs
+++ b/src/Sms.Environment.Linux/LinuxEnvironmentVariableStore.cs
@@ -1,5 +1,3 @@
-using Sms.Environment;
-
 namespace Sms.Environment.Linux;
 
 public sealed class LinuxEnvironmentVariableStore : IEnvironmentVariableStore
diff --git a/src/Sms.TaskTwo.Avalonia/App.axaml b/src/Sms.TaskTwo.Avalonia/App.axaml
index 3ffec8b..354124e 100644
--- a/src/Sms.TaskTwo.Avalonia/App.axaml
+++ b/src/Sms.TaskTwo.Avalonia/App.axaml
@@ -17,10 +17,24 @@
     <Style Selector="Button.titleButton:pointerover">
       <Setter Property="Background" Value="#D8D8D8" />
     </Style>
+    <Style Selector="Button.titleButton.close">
+      <Setter Property="CornerRadius" Value="0,11,0,0" />
+    </Style>
     <Style Selector="Button.titleButton.close:pointerover">
       <Setter Property="Background" Value="#E81123" />
       <Setter Property="Foreground" Value="White" />
     </Style>
+    <Style Selector="DataGrid.roundedGrid">
+      <Setter Property="RowHeight" Value="32" />
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="DataGrid.roundedGrid DataGridColumnHeader">
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="DataGrid.roundedGrid DataGridColumnHeader /template/ Border#HeaderBorder">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+    </Style>
     <Style Selector="DataGridRow.appSettings">
       <Setter Property="Background" Value="#E3F2FD" />
     </Style>
@@ -34,8 +48,5 @@
     <Style Selector="DataGridRow.appSettings.userStore">
       <Setter Property="Background" Value="#C8E6C9" />
     </Style>
-    <Style Selector="DataGrid">
-      <Setter Property="RowHeight" Value="32" />
-    </Style>
   </Application.Styles>
 </Application>
diff --git a/src/Sms.TaskTwo.Avalonia/AppResources.cs b/src/Sms.TaskTwo.Avalonia/AppResources.cs
new file mode 100644
index 0000000..2b31229
--- /dev/null
+++ b/src/Sms.TaskTwo.Avalonia/AppResources.cs
@@ -0,0 +1,6 @@
+namespace Sms.TaskTwo.Avalonia;
+
+public static class AppResources
+{
+    public const string WindowTitle = "Тестовое Avalonia-приложение для SmartMealService";
+}
diff --git a/src/Sms.TaskTwo.Avalonia/Views/MainWindow.axaml b/src/Sms.TaskTwo.Avalonia/Views/MainWindow.axaml
index 39ebab8..5d7a8e9 100644
--- a/src/Sms.TaskTwo.Avalonia/Views/MainWindow.axaml
+++ b/src/Sms.TaskTwo.Avalonia/Views/MainWindow.axaml
@@ -6,8 +6,8 @@
         mc:Ignorable="d"
         x:Class="Sms.TaskTwo.Avalonia.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
-        Title="{x:Static core:AppResources.WindowTitle}"
-        xmlns:core="using:Sms.TaskTwo.Core"
+        Title="{x:Static app:AppResources.WindowTitle}"
+        xmlns:app="using:Sms.TaskTwo.Avalonia"
         Width="960"
         Height="600"
         MinWidth="760"
@@ -20,26 +20,30 @@
           Background="White"
           BorderBrush="#C8C8C8"
           BorderThickness="1"
-          Margin="8">
+          Margin="8"
+          ClipToBounds="True">
     <Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
-      <Grid Grid.Row="0"
-            ColumnDefinitions="*,Auto,Auto"
-            Background="#ECECEC"
-            Height="44">
-        <TextBlock Grid.Column="0"
-                   Text="{x:Static core:AppResources.WindowTitle}"
-                   VerticalAlignment="Center"
-                   Margin="16,0,8,0"
-                   FontSize="14" />
-        <Button Grid.Column="1"
-                Classes="titleButton"
-                Content="−"
-                Click="OnMinimizeClick" />
-        <Button Grid.Column="2"
-                Classes="titleButton close"
-                Content="×"
-                Click="OnCloseClick" />
-      </Grid>
+      <Border Grid.Row="0"
+              Background="#ECECEC"
+              CornerRadius="11,11,0,0"
+              ClipToBounds="True"
+              Height="44">
+        <Grid ColumnDefinitions="*,Auto,Auto">
+          <TextBlock Grid.Column="0"
+                     Text="{x:Static app:AppResources.WindowTitle}"
+                     VerticalAlignment="Center"
+                     Margin="16,0,8,0"
+                     FontSize="14" />
+          <Button Grid.Column="1"
+                  Classes="titleButton"
+                  Content="−"
+                  Click="OnMinimizeClick" />
+          <Button Grid.Column="2"
+                  Classes="titleButton close"
+                  Content="×"
+                  Click="OnCloseClick" />
+        </Grid>
+      </Border>
 
       <Grid Grid.Row="1"
             Margin="12,8,12,0"
@@ -89,51 +93,57 @@
                    IsVisible="{Binding ReloadEnvironmentMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
       </StackPanel>
 
-      <DataGrid x:Name="VariablesGrid"
-                Grid.Row="4"
-                Margin="12,4,12,12"
-                ItemsSource="{Binding Rows}"
-                AutoGenerateColumns="False"
-                CanUserReorderColumns="False"
-                CanUserResizeColumns="True"
-                CanUserSortColumns="False"
-                GridLinesVisibility="All"
-                HeadersVisibility="Column"
-                BorderThickness="1"
-                BorderBrush="#B0B0B0"
-                LoadingRow="OnLoadingRow">
-        <DataGrid.Columns>
-          <DataGridTemplateColumn Header=""
-                                  Width="44">
-            <DataGridTemplateColumn.CellTemplate>
-              <DataTemplate x:DataType="vm:EnvironmentVariableRowViewModel">
-                <CheckBox IsChecked="{Binding UseUserStore, Mode=TwoWay}"
-                          IsEnabled="{Binding CanChangeUserStore}"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center" />
-              </DataTemplate>
-            </DataGridTemplateColumn.CellTemplate>
-          </DataGridTemplateColumn>
-          <DataGridTextColumn Header="Поле"
-                              Binding="{Binding Field}"
-                              IsReadOnly="True"
-                              Width="210"
-                              MinWidth="150" />
-          <DataGridTextColumn Header="Требуемое значение"
-                              Binding="{Binding RequiredValue, Mode=TwoWay}"
-                              Width="2*"
-                              MinWidth="140" />
-          <DataGridTextColumn Header="Актуальное значение"
-                              Binding="{Binding ActualValueDisplay}"
-                              IsReadOnly="True"
-                              Width="2*"
-                              MinWidth="140" />
-          <DataGridTextColumn Header="Комментарий"
-                              Binding="{Binding Comment, Mode=TwoWay}"
-                              Width="240"
-                              MinWidth="180" />
-        </DataGrid.Columns>
-      </DataGrid>
+      <Border Grid.Row="4"
+              Margin="12,4,12,12"
+              CornerRadius="8"
+              ClipToBounds="True"
+              Background="White"
+              BorderBrush="#B0B0B0"
+              BorderThickness="1">
+        <DataGrid x:Name="VariablesGrid"
+                  Classes="roundedGrid"
+                  ItemsSource="{Binding Rows}"
+                  AutoGenerateColumns="False"
+                  CanUserReorderColumns="False"
+                  CanUserResizeColumns="True"
+                  CanUserSortColumns="False"
+                  GridLinesVisibility="All"
+                  HeadersVisibility="Column"
+                  BorderThickness="0"
+                  LoadingRow="OnLoadingRow">
+          <DataGrid.Columns>
+            <DataGridTemplateColumn Header=""
+                                    Width="44">
+              <DataGridTemplateColumn.CellTemplate>
+                <DataTemplate x:DataType="vm:EnvironmentVariableRowViewModel">
+                  <CheckBox IsChecked="{Binding UseUserStore, Mode=TwoWay}"
+                            IsEnabled="{Binding CanChangeUserStore}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center" />
+                </DataTemplate>
+              </DataGridTemplateColumn.CellTemplate>
+            </DataGridTemplateColumn>
+            <DataGridTextColumn Header="Поле"
+                                Binding="{Binding Field}"
+                                IsReadOnly="True"
+                                Width="210"
+                                MinWidth="150" />
+            <DataGridTextColumn Header="Требуемое значение"
+                                Binding="{Binding RequiredValue, Mode=TwoWay}"
+                                Width="2*"
+                                MinWidth="140" />
+            <DataGridTextColumn Header="Актуальное значение"
+                                Binding="{Binding ActualValueDisplay}"
+                                IsReadOnly="True"
+                                Width="2*"
+                                MinWidth="140" />
+            <DataGridTextColumn Header="Комментарий"
+                                Binding="{Binding Comment, Mode=TwoWay}"
+                                Width="240"
+                                MinWidth="180" />
+          </DataGrid.Columns>
+        </DataGrid>
+      </Border>
     </Grid>
   </Border>
 </Window>
diff --git a/src/Sms.TaskTwo.Core/AppResources.cs b/src/Sms.TaskTwo.Core/AppResources.cs
deleted file mode 100644
index 4b93e1c..0000000
--- a/src/Sms.TaskTwo.Core/AppResources.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Sms.TaskTwo.Core;
-
-public static class AppResources
-{
-    public const string WindowTitle = "Тестовое WPF-приложение для SmartMealService";
-}