From f630287d35d46a104c1e42142c115fdf9256a0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B8=CC=86=20=D0=91=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2=D0=B8=D1=87?=
 <Pilipenko.A.Bo@sberbank.ru>
Date: Fri, 21 Nov 2025 19:02:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=83=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainPage.xaml    | 37 ++++++++++++++++++-------------------
 MainPage.xaml.cs | 14 ++++++--------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/MainPage.xaml b/MainPage.xaml
index dc0db9c..36ecfbe 100644
--- a/MainPage.xaml
+++ b/MainPage.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    <?xml version="1.0" encoding="utf-8" ?>
+    <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 x:Class="CommanderApp.MainPage"
                 Title="MAUI Commander">
@@ -30,7 +30,7 @@
         <ScrollView x:Name="LeftScrollView"
                 Grid.Row="2" Grid.Column="0"
                 BackgroundColor="White">
-            <VerticalStackLayout x:Name="LeftPanel" Spacing="0"/>
+                <VerticalStackLayout x:Name="LeftPanel" Spacing="0"/>
         </ScrollView>
 
         <!-- Правая панель -->
@@ -55,22 +55,21 @@
 
         <!-- Toolbar -->
         <FlexLayout x:Name="ToolbarLayout"
-            Grid.Row="3"
-            Grid.ColumnSpan="2"
-            Padding="10"
-            BackgroundColor="Transparent"
-            Direction="Row"
-            Wrap="Wrap"
-            JustifyContent="Center"
-            AlignItems="Center">
-
-            <Button x:Name="CopyButton" Text="F5 Copy" Clicked="OnCopyClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
-            <Button x:Name="MoveButton" Text="F6 Move" Clicked="OnMoveClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
-            <Button x:Name="MkdirButton" Text="F7 Mkdir" Clicked="OnMkdirClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
-            <Button x:Name="DeleteButton" Text="F8 Delete" Clicked="OnDeleteClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
-            <Button x:Name="HomeButton" Text="Home" Clicked="OnHomeClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
-            <Button x:Name="ExitButton" Text="F10 Exit" Clicked="OnExitClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,0,8" />
+                Grid.Row="3"
+                Grid.ColumnSpan="2"
+                Padding="10"
+                BackgroundColor="Transparent"
+                Direction="Row"
+                Wrap="Wrap"
+                JustifyContent="Center"
+                AlignItems="Center">
 
+                <Button x:Name="CopyButton" Text="F5 Copy" Clicked="OnCopyClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+                <Button x:Name="MoveButton" Text="F6 Move" Clicked="OnMoveClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+                <Button x:Name="MkdirButton" Text="F7 Mkdir" Clicked="OnMkdirClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+                <Button x:Name="DeleteButton" Text="F8 Delete" Clicked="OnDeleteClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+                <Button x:Name="HomeButton" Text="Home" Clicked="OnHomeClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+                <Button x:Name="ExitButton" Text="F10 Exit" Clicked="OnExitClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,0,8" />
         </FlexLayout>
     </Grid>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/MainPage.xaml.cs b/MainPage.xaml.cs
index 5c42f4e..7669edc 100644
--- a/MainPage.xaml.cs
+++ b/MainPage.xaml.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using CommanderApp.Services;
-using Microsoft.Maui.Controls;
 
 namespace CommanderApp;
 
@@ -31,7 +30,7 @@ public partial class MainPage : ContentPage, INotifyPropertyChanged
             if (_panelManager.LeftPanelPath != value)
             {
                 _panelManager.UpdatePanelPaths(value, _panelManager.RightPanelPath);
-                OnPropertyChanged();
+                NotifyPropertyChanged();
             }
         }
     }
@@ -44,7 +43,7 @@ public partial class MainPage : ContentPage, INotifyPropertyChanged
             if (_panelManager.RightPanelPath != value)
             {
                 _panelManager.UpdatePanelPaths(_panelManager.LeftPanelPath, value);
-                OnPropertyChanged();
+                NotifyPropertyChanged();
             }
         }
     }
@@ -580,11 +579,10 @@ public partial class MainPage : ContentPage, INotifyPropertyChanged
     private void OnExitClicked(object sender, EventArgs e) => Application.Current?.Quit();
 
     // INotifyPropertyChanged
-    public event PropertyChangedEventHandler? PropertyChanged;
-    protected void SetProperty<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
+    public new event PropertyChangedEventHandler? PropertyChanged;
+
+    protected virtual void NotifyPropertyChanged([CallerMemberName] string? propertyName = null)
     {
-        if (EqualityComparer<T>.Default.Equals(field, value)) return;
-        field = value;
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
-}
\ No newline at end of file
+}