Added: MultiLineTextEditor, TimePicker; Unified look of popups

steto-scope · Aug 12, 2014 · 98f8e6f · 98f8e6f
1 parent af0458d
commit 98f8e6f
Show file tree

Hide file tree

Showing 4 changed files with 213 additions and 54 deletions.
diff --git a/Monotone/MainWindow.xaml b/Monotone/MainWindow.xaml
@@ -299,6 +299,11 @@
                             </xtk:SplitButton.DropDownContent>
 
                         </xtk:SplitButton>
+                        <xtk:TimelinePanel BeginDate="01/01/2007" EndDate="12/31/2007" Margin="5">
+                            <TextBlock Text="TimelinePanel" xtk:TimelinePanel.Date="02/01/2007"  />
+                            <TextBlock Text="TimelinePanel" xtk:TimelinePanel.Date="03/31/2007" />
+                            <TextBlock Text="TimelinePanel" xtk:TimelinePanel.Date="07/06/2007" />
+                        </xtk:TimelinePanel>
 
                     </StackPanel>
 
@@ -325,6 +330,9 @@
                             </xtk:RichTextBoxFormatBarManager.FormatBar>
                         </xtk:RichTextBox>
                         <xtk:CalculatorUpDown Margin="5"></xtk:CalculatorUpDown>
+                        <xtk:MultiLineTextEditor Margin="5">
+                            MultiLineTextEditor
+                        </xtk:MultiLineTextEditor>
                     </StackPanel>
 
                     <StackPanel Grid.Column="2">

diff --git a/Monotone/Monotone.Brushes.xaml b/Monotone/Monotone.Brushes.xaml
@@ -5,6 +5,7 @@
     <SolidColorBrush Color="{DynamicResource BaseColor}" x:Key="BaseBrush" />
     <SolidColorBrush Color="{DynamicResource Base2Color}" x:Key="LighterBaseBrush" />
     <SolidColorBrush Color="{DynamicResource Base4Color}" x:Key="VeryLighterBaseBrush" />
+    <SolidColorBrush Color="{DynamicResource Base6Color}" x:Key="PopupBorderBrush" />
     <SolidColorBrush Color="{DynamicResource BaseM2Color}" x:Key="DarkerBaseBrush" />
     <SolidColorBrush Color="{StaticResource TextColor}" x:Key="TextBrush" />
     <SolidColorBrush Color="{DynamicResource Base3Color}" x:Key="BaseBorderBrush" />