Kaynağa Gözat

кнопки кнопки кнопки кнопки нкопки кнопки

Danila Alekseev 1 yıl önce
ebeveyn
işleme
370276d6f8

+ 5 - 5
ROGOZ/MainWindow.xaml

@@ -41,11 +41,11 @@
                 <RowDefinition Height="50"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <Button x:Name="btnClose" Style="{DynamicResource PanelButtonX}" Margin="5" Grid.Row="0" Grid.Column="1" Background="Blue">
-                <Image Source="/Resources/Cross.png"  IsHitTestVisible="False"/>
+            <Button x:Name="btnClose" Style="{DynamicResource PanelButtonX}" Margin="0,10,10,0" Grid.Row="0" Grid.Column="1" Height="35" Width="35" Click="btnClose_Click">
+                <Image Source="/Resources/Cross1.png"  IsHitTestVisible="False"/>
             </Button>
-            <Button x:Name="btnMinimize" Style="{DynamicResource PanelButtonMin}" Margin="0,5,40,0" Grid.Row="0" Grid.Column="1" Background="Blue">
-                <Image Source="/Resources/Minimize.png" IsHitTestVisible="False" />
+            <Button x:Name="btnMinimize" Style="{DynamicResource PanelButtonMin}" Margin="0,10,55,0" Grid.Row="0" Grid.Column="1" Height="35" Width="35" Click="btnMinimize_Click">
+                <Image Source="/Resources/Minimize1.png" IsHitTestVisible="False"/>
             </Button>
             <Frame Name="MainFrame" NavigationUIVisibility="Hidden" Grid.Column="1" Grid.Row="1"/>
             
@@ -91,7 +91,7 @@
                 </Button>
 
             </StackPanel>
-            <StackPanel VerticalAlignment="Bottom" Height="3" Width="225" Margin="0,0,0,100" Background="#002F55"/>
+            <StackPanel VerticalAlignment="Bottom" Height="3" Width="250" Margin="0,0,0,100" Background="#2e5d85"/>
             <Button Name="AccExit" Style="{DynamicResource NaviButtons}" VerticalAlignment="Bottom" Margin="0,0,0,15">
                 <Grid Width="280">
                     <TextBlock Text="Выход" Style="{StaticResource Text_Style}"/>

+ 11 - 1
ROGOZ/MainWindow.xaml.cs

@@ -23,7 +23,7 @@ namespace ROGOZ
         public MainWindow()
         {
             InitializeComponent();
-            MainFrame.Navigate(new Pages.TaskList());
+            //MainFrame.Navigate(new Pages.TaskList());
         }
 
         private void Window_MouseDown(object sender, MouseButtonEventArgs e)
@@ -31,5 +31,15 @@ namespace ROGOZ
             if (e.LeftButton == MouseButtonState.Pressed) { DragMove(); }
         }
 
+        private void btnClose_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnMinimize_Click(object sender, RoutedEventArgs e)
+        {
+            //Application.Current.MainWindow.WindowState = WindowState.Minimized;
+            Application.Current.MainWindow.WindowState = WindowState.Minimized;
+        }
     }
 }

+ 2 - 0
ROGOZ/ROGOZ.csproj

@@ -215,6 +215,8 @@
       <DependentUpon>Model1.edmx</DependentUpon>
       <LastGenOutput>Model1.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\Cross1.png" />
+    <Resource Include="Resources\Minimize1.png" />
     <Resource Include="Resources\AccExit.png" />
     <Resource Include="Resources\EMPLOYEE.png" />
     <Resource Include="Resources\HELPES.png" />

BIN
ROGOZ/Resources/Cross1.png


BIN
ROGOZ/Resources/Minimize1.png