@@ -163,6 +163,7 @@ protected override void OnApplyTemplate()
163
163
_DeleteButtonVisibleStateGroups = stateGroups . SingleOrDefault ( sg => sg . Name == "ButtonStates" ) ;
164
164
if ( _DeleteButtonVisibleStateGroups != null )
165
165
_DeleteButtonVisibleState = _DeleteButtonVisibleStateGroups . States . SingleOrDefault ( s => s . Name == "ButtonVisible" ) ;
166
+ UpdateClearButtonVisible ( ) ;
166
167
}
167
168
168
169
_scrollViewer = GetTemplateChild ( "ContentElement" ) as ScrollViewer ;
@@ -387,21 +388,26 @@ void SyncBaseText()
387
388
SelectionStart = base . Text . Length ;
388
389
}
389
390
390
- static void ClearButtonVisibleChanged ( DependencyObject dependencyObject , DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs )
391
+ void UpdateClearButtonVisible ( )
391
392
{
392
- var textBox = ( FormsTextBox ) dependencyObject ;
393
- var visibleState = textBox . _DeleteButtonVisibleState ;
394
- var states = textBox . _DeleteButtonVisibleStateGroups ? . States ;
393
+ var visibleState = _DeleteButtonVisibleState ;
394
+ var states = _DeleteButtonVisibleStateGroups ? . States ;
395
395
396
396
if ( states != null && visibleState != null )
397
397
{
398
- if ( textBox . ClearButtonVisible && ! states . Contains ( visibleState ) )
398
+ if ( ClearButtonVisible && ! states . Contains ( visibleState ) )
399
399
states . Add ( visibleState ) ;
400
400
else
401
401
states . Remove ( visibleState ) ;
402
402
}
403
403
}
404
404
405
+ static void ClearButtonVisibleChanged ( DependencyObject dependencyObject , DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs )
406
+ {
407
+ var textBox = ( FormsTextBox ) dependencyObject ;
408
+ textBox . UpdateClearButtonVisible ( ) ;
409
+ }
410
+
405
411
static void TextPropertyChanged ( DependencyObject dependencyObject , DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs )
406
412
{
407
413
var textBox = ( FormsTextBox ) dependencyObject ;
0 commit comments