From 1763c930b687cfbffbed38dbe8a46d1cfcec0258 Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Tue, 2 Nov 2010 03:15:02 +0000 Subject: [PATCH] renamed IRichTextBoxFormatBar property from RichTextBox to Target. This describes the purpose of the property better when creating your own custom format bar. --- .../IRichTextBoxFormatBar.cs | 5 +++- .../RichTextBoxFormatBar.xaml | 12 ++++----- .../RichTextBoxFormatBar.xaml.cs | 26 +++++++++---------- .../RichTextBoxFormatBarManager.cs | 2 +- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs index a39f4105..46c38afe 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs @@ -4,6 +4,9 @@ namespace Microsoft.Windows.Controls { public interface IRichTextBoxFormatBar { - global::System.Windows.Controls.RichTextBox RichTextBox { get; set; } + /// + /// Represents the RichTextBox that will be the target for all text manipulations in the format bar. + /// + global::System.Windows.Controls.RichTextBox Target { get; set; } } } diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml index 3c793a16..6d919c41 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml @@ -168,30 +168,30 @@ + Command="EditingCommands.ToggleBold" CommandTarget="{Binding ElementName=_window, Path=Target}"> + Command="{x:Static EditingCommands.ToggleItalic}" CommandTarget="{Binding ElementName=_window, Path=Target}"> + Command="{x:Static EditingCommands.ToggleUnderline}" CommandTarget="{Binding ElementName=_window, Path=Target}"> + Command="{x:Static EditingCommands.AlignLeft}" CommandTarget="{Binding ElementName=_window, Path=Target}" > + Command="{x:Static EditingCommands.AlignCenter}" CommandTarget="{Binding ElementName=_window, Path=Target}" > + Command="{x:Static EditingCommands.AlignRight}" CommandTarget="{Binding ElementName=_window, Path=Target}" > diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs index 35356c8b..65e78914 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs @@ -17,11 +17,11 @@ namespace Microsoft.Windows.Controls #region RichTextBox - public static readonly DependencyProperty RichTextBoxProperty = DependencyProperty.Register("RichTextBox", typeof(global::System.Windows.Controls.RichTextBox), typeof(RichTextBoxFormatBar), new PropertyMetadata(null, new PropertyChangedCallback(OnRichTextBoxPropertyChanged))); - public global::System.Windows.Controls.RichTextBox RichTextBox + public static readonly DependencyProperty TargetProperty = DependencyProperty.Register("Target", typeof(global::System.Windows.Controls.RichTextBox), typeof(RichTextBoxFormatBar), new PropertyMetadata(null, OnRichTextBoxPropertyChanged)); + public global::System.Windows.Controls.RichTextBox Target { - get { return (global::System.Windows.Controls.RichTextBox)GetValue(RichTextBoxProperty); } - set { SetValue(RichTextBoxProperty, value); } + get { return (global::System.Windows.Controls.RichTextBox)GetValue(TargetProperty); } + set { SetValue(TargetProperty, value); } } private static void OnRichTextBoxPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) @@ -32,12 +32,12 @@ namespace Microsoft.Windows.Controls private void HookupRichTextBoxEvents() { - RichTextBox.SelectionChanged += RichTextBox_SelectionChanged; + Target.SelectionChanged += RichTextBox_SelectionChanged; } #endregion //RichTextBox - public double[] FontSizes + public static double[] FontSizes { get { @@ -67,7 +67,7 @@ namespace Microsoft.Windows.Controls void FormatToolbar_Loaded(object sender, RoutedEventArgs e) { - _cmbFontFamilies.ItemsSource = System.Windows.Media.Fonts.SystemFontFamilies; + _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies; _cmbFontSizes.ItemsSource = FontSizes; } @@ -122,13 +122,13 @@ namespace Microsoft.Windows.Controls void UpdateItemCheckedState(ToggleButton button, DependencyProperty formattingProperty, object expectedValue) { - object currentValue = RichTextBox.Selection.GetPropertyValue(formattingProperty); + object currentValue = Target.Selection.GetPropertyValue(formattingProperty); button.IsChecked = (currentValue == DependencyProperty.UnsetValue) ? false : currentValue != null && currentValue.Equals(expectedValue); } private void UpdateSelectedFontFamily() { - object value = RichTextBox.Selection.GetPropertyValue(TextElement.FontFamilyProperty); + object value = Target.Selection.GetPropertyValue(TextElement.FontFamilyProperty); FontFamily currentFontFamily = (FontFamily)((value == DependencyProperty.UnsetValue) ? null : value); if (currentFontFamily != null) { @@ -138,7 +138,7 @@ namespace Microsoft.Windows.Controls private void UpdateSelectedFontSize() { - object value = RichTextBox.Selection.GetPropertyValue(TextElement.FontSizeProperty); + object value = Target.Selection.GetPropertyValue(TextElement.FontSizeProperty); _cmbFontSizes.SelectedValue = (value == DependencyProperty.UnsetValue) ? null : value; } @@ -147,13 +147,13 @@ namespace Microsoft.Windows.Controls if (value == null) return; - RichTextBox.Selection.ApplyPropertyValue(formattingProperty, value); + Target.Selection.ApplyPropertyValue(formattingProperty, value); } private void ProcessMove(DragDeltaEventArgs e) { - AdornerLayer layer = AdornerLayer.GetAdornerLayer(RichTextBox); - UIElementAdorner adorner = layer.GetAdorners(RichTextBox)[0] as UIElementAdorner; + AdornerLayer layer = AdornerLayer.GetAdornerLayer(Target); + UIElementAdorner adorner = layer.GetAdorners(Target)[0] as UIElementAdorner; adorner.SetOffsets(adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange); } diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs index e4e89543..2ca2acae 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs @@ -92,7 +92,7 @@ namespace Microsoft.Windows.Controls _adorner = new UIElementAdorner(_richTextBox); - formatBar.RichTextBox = _richTextBox; + formatBar.Target = _richTextBox; _toolbar = formatBar; }