tsai
/
wpftoolkit
mirror of https://github.com/xceedsoftware/wpftoolkit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed Watermarks so that they cannot receive focus.

import/raw
brianlagunas_cp 16 years ago
parent
a33d9ca9c6
commit
ab936dd3e1
5 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
  2. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
  3. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
  4. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
  5. 2
      Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml

2
Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
View File

@ -51,7 +51,7 @@
</Style> </Style>
<DataTemplate x:Key="DefaultWatermarkTemplate"> <DataTemplate x:Key="DefaultWatermarkTemplate">
<ContentControl Content="{Binding}" Foreground="Gray" /> <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
</DataTemplate> </DataTemplate>
<!-- =============================================================================== --> <!-- =============================================================================== -->

2
Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
View File

@ -3,7 +3,7 @@
xmlns:local="clr-namespace:Microsoft.Windows.Controls"> xmlns:local="clr-namespace:Microsoft.Windows.Controls">
<DataTemplate x:Key="DefaultWatermarkTemplate"> <DataTemplate x:Key="DefaultWatermarkTemplate">
<ContentControl Content="{Binding}" Foreground="Gray" /> <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
</DataTemplate> </DataTemplate>
<!-- =============================================================================== --> <!-- =============================================================================== -->

2
Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Themes/Generic.xaml
View File

@ -7,7 +7,7 @@
<coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" /> <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
<DataTemplate x:Key="DefaultWatermarkTemplate"> <DataTemplate x:Key="DefaultWatermarkTemplate">
<ContentControl Content="{Binding}" Foreground="Gray" /> <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
</DataTemplate> </DataTemplate>
<!-- =============================================================================== --> <!-- =============================================================================== -->

2
Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
View File

@ -6,7 +6,7 @@
<coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" /> <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
<DataTemplate x:Key="DefaultWatermarkTemplate"> <DataTemplate x:Key="DefaultWatermarkTemplate">
<ContentControl Content="{Binding}" Foreground="Gray" /> <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
</DataTemplate> </DataTemplate>
<!-- =============================================================================== --> <!-- =============================================================================== -->

2
Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
View File

@ -24,7 +24,7 @@
<SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" /> <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
<DataTemplate x:Key="DefaultWatermarkTemplate"> <DataTemplate x:Key="DefaultWatermarkTemplate">
<ContentControl Content="{Binding}" Foreground="Gray" /> <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
</DataTemplate> </DataTemplate>
<Style TargetType="{x:Type local:WatermarkTextBox}"> <Style TargetType="{x:Type local:WatermarkTextBox}">

Write Preview
Loading…
Cancel
Save