Jelajahi Sumber

Комбо боксы первый вариант

Danila Alekseev 1 tahun lalu
induk
melakukan
0ee41fcab2
2 mengubah file dengan 32 tambahan dan 10 penghapusan
  1. 26 4
      ROGOZ/Dictionary.xaml
  2. 6 6
      ROGOZ/Pages/AddEditPage.xaml

+ 26 - 4
ROGOZ/Dictionary.xaml

@@ -307,16 +307,15 @@
     
     <!--Добавление задачи-->
 
+    <!--ТектсБоксы-->
     <Style x:Key="AddTaskTB" TargetType="TextBox">
-        <Setter Property="Background" Value="#9ACEEB"/>
+        <Setter Property="Background" Value="#edf4fa"/>
         <Setter Property="Height" Value="45"/>
         <Setter Property="FontSize" Value="25"/>
         <Setter Property="FontFamily" Value="Comic Sans MS"/>
         <Setter Property="AllowDrop" Value="True"/>
         <Setter Property="BorderThickness" Value="3"/>
         <Setter Property="Cursor" Value="IBeam"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="6 -1 6 -1"/>
@@ -325,7 +324,30 @@
                 <Setter Property="CornerRadius" Value="10"/>
             </Style>
         </Style.Resources>
-        
     </Style>
+    
+    <!--КомбоБоксы-->
+
+    <Style x:Key="AddTaskCmb" TargetType="ComboBox">
+        <Setter Property="Background" Value="#edf4fa"/>
+        <Setter Property="Height" Value="45"/>
+        <Setter Property="FontSize" Value="25"/>
+        <Setter Property="FontFamily" Value="Comic Sans MS"/>
+        <Setter Property="AllowDrop" Value="True"/>
+        <Setter Property="BorderThickness" Value="3"/>
+        <Setter Property="Cursor" Value="IBeam"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Padding" Value="6 -1 6 -1"/>
+    </Style>
+
+    <Style x:Key="AddTaskCmbItem" TargetType="ComboBoxItem">
+        <Style.Resources>
+            <Style TargetType ="Border">
+                <Setter Property="CornerRadius" Value="5"/>
+            </Style>
+        </Style.Resources>
+    </Style>
+        
 
 </ResourceDictionary>

+ 6 - 6
ROGOZ/Pages/AddEditPage.xaml

@@ -22,12 +22,12 @@
                 <StackPanel Width="410" Orientation="Vertical">
                     <StackPanel Orientation="Vertical">
                         <TextBlock Text="Cтатус задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
-                        <ComboBox x:Name="CmbStatus" Text="{Binding Status}" DisplayMemberPath="Name" Height="35" Width="370" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <ComboBox x:Name="CmbStatus" Text="{Binding Status}" DisplayMemberPath="Name" Width="370" HorizontalAlignment="Left" Margin="10,0,0,0" Style="{DynamicResource AddTaskCmb}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical">
                         <TextBlock Text="Характер задачи:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="40,10,0,5"/>
-                        <ComboBox x:Name="CmbTaskType" Text="{Binding WorkType}" DisplayMemberPath="Name" Height="35" Width="370" HorizontalAlignment="Left" Margin="10,0,0,0"/>
+                        <ComboBox x:Name="CmbTaskType" Text="{Binding WorkType}" DisplayMemberPath="Name" Width="370" HorizontalAlignment="Left" Margin="10,0,0,0" Style="{DynamicResource AddTaskCmb}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}"/>
                     </StackPanel>
 
                     <StackPanel Orientation="Vertical">
@@ -40,19 +40,19 @@
 
             <StackPanel Orientation="Vertical">
                 <TextBlock Text="Исполнитель:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,10,0,5"/>
-                <ComboBox x:Name="CmbExecutor" Text="{Binding ExecutorID}" DisplayMemberPath="ID" Height="35" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>
+                <ComboBox x:Name="CmbExecutor" Text="{Binding ExecutorID}" DisplayMemberPath="ID" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0" Style="{DynamicResource AddTaskCmb}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}"/>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
-                <StackPanel Orientation="Vertical" Width="250">
+                <StackPanel Orientation="Vertical" Width="275">
                     <TextBlock Text="Срок исполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="30,10,0,5"/>
                     <DatePicker Name="DPDeadLine" SelectedDate="{Binding Deadline}" Margin="25,0,0,0"/>
                 </StackPanel>
-                <StackPanel Orientation="Vertical" Width="250">
+                <StackPanel Orientation="Vertical" Width="275">
                     <TextBlock Text="Дата выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="25,10,0,5"/>
                     <DatePicker Name="DPCreateDateTime" SelectedDate="{Binding CreateDateTime}" Margin="15,0,10,0"/>
                 </StackPanel>
-                <StackPanel Orientation="Vertical" Width="250">
+                <StackPanel Orientation="Vertical" Width="270">
                     <TextBlock Text="Время выполнения:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="240" Margin="10,10,0,5"/>
                     <TextBox x:Name="TimeTB" Text="{Binding Time}" Margin="10,0,25,0" Style="{DynamicResource AddTaskTB}"/>
                 </StackPanel>