浏览代码

Кнопка редакт для задач

Danila Alekseev 1 年之前
父节点
当前提交
ade8a6102d
共有 4 个文件被更改,包括 25 次插入3 次删除
  1. 21 2
      ROGOZ/Dictionary.xaml
  2. 3 1
      ROGOZ/Pages/TaskList.xaml
  3. 1 0
      ROGOZ/ROGOZ.csproj
  4. 二进制
      ROGOZ/Resources/EditTask.png

+ 21 - 2
ROGOZ/Dictionary.xaml

@@ -847,6 +847,9 @@
                 </MultiTrigger.Conditions>
                 <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
             </MultiTrigger>
+            <DataTrigger Binding="{Binding IsActive}" Value="true">
+                <Setter Property="Background" Value="Green"/>
+            </DataTrigger>
         </Style.Triggers>
     </Style>
 
@@ -893,6 +896,7 @@
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="#a6cdf5"/>
             </Trigger>
+            
         </Style.Triggers>
     </Style>
 
@@ -934,8 +938,23 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    
-    
+
+
+    <Style x:Key="EditTaskButton" TargetType="Button">
+        <Setter Property="Background" Value="#a0cdfa"/>
+        <Setter Property="Height" Value="40"/>
+        <Setter Property="Width" Value="40"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Style.Resources>
+            <Style TargetType ="Border">
+                <Setter Property="CornerRadius" Value="15"/>
+            </Style>
+        </Style.Resources>
+    </Style>
+
+
     <!--Кнопки добавить и удалить для задач-->
 
     <Style x:Key="AddDeleteBtn" TargetType="Button">

+ 3 - 1
ROGOZ/Pages/TaskList.xaml

@@ -37,7 +37,9 @@
                 <DataGridTemplateColumn Width="auto">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <Button Content="Редактировать" Name="BtnEdit" Width="150" Click="BtnEdit_Click" />
+                            <Button Name="BtnEdit" Width="40" Height="40" Click="BtnEdit_Click" Style="{DynamicResource EditTaskButton}">
+                                <Image Source="/Resources/EditTask.png" />
+                            </Button>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>

+ 1 - 0
ROGOZ/ROGOZ.csproj

@@ -239,6 +239,7 @@
       <DependentUpon>Model1.edmx</DependentUpon>
       <LastGenOutput>Model1.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\EditTask.png" />
     <Resource Include="Resources\Calendar.png" />
     <Resource Include="Resources\AccExit.png" />
     <Resource Include="Resources\Helper.png" />

二进制
ROGOZ/Resources/EditTask.png