Browse Source

MultilineTextEditor: fixed exception when creating more than one instance. This was due to the default image being set as the content. Applied the x:Shared attribute to resolve.

pull/1645/head
brianlagunas_cp 15 years ago
parent
commit
e94609c094
  1. 8
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
  2. 6
      ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml

8
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml

@ -6,6 +6,8 @@
<coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
<Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
<LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FFA3AEB9" Offset="0"/>
<GradientStop Color="#FF8399A9" Offset="0.375"/>
@ -71,11 +73,7 @@
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1,1,0,1" />
<Setter Property="Content">
<Setter.Value>
<Image Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
</Setter.Value>
</Setter>
<Setter Property="Content" Value="{StaticResource DefaultContent}" />
<Setter Property="Focusable" Value="False" />
<Setter Property="Padding" Value="2,0,0,0" />
<Setter Property="HorizontalContentAlignment" Value="Center" />

6
ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml

@ -6,6 +6,8 @@
<coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
<Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
<LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FFA3AEB9" Offset="0"/>
<GradientStop Color="#FF8399A9" Offset="0.375"/>
@ -58,8 +60,6 @@
</Setter>
</Style>
<Image x:Key="ImageContent" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
<Style TargetType="{x:Type local:MultiLineTextEditor}">
<Setter Property="Background" Value="White"/>
<Setter Property="BorderBrush">
@ -73,7 +73,7 @@
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1,1,0,1" />
<Setter Property="Content" Value="{StaticResource ImageContent}" />
<Setter Property="Content" Value="{StaticResource DefaultContent}" />
<Setter Property="Focusable" Value="False" />
<Setter Property="Padding" Value="2,0,0,0" />
<Setter Property="HorizontalContentAlignment" Value="Center" />

Loading…
Cancel
Save