File tree Expand file tree Collapse file tree 4 files changed +35
-3
lines changed
src/Files.App.Controls/Omnibar Expand file tree Collapse file tree 4 files changed +35
-3
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,18 @@ public partial class Omnibar
2121 public partial OmnibarMode ? CurrentActiveMode { get ; set ; }
2222
2323 [ GeneratedDependencyProperty ]
24- public partial object ? DefaultInactiveMode { get ; set ; }
24+ public partial FrameworkElement ? DefaultInactiveMode { get ; set ; }
25+
26+ partial void OnDefaultInactiveModeChanged ( FrameworkElement ? newValue )
27+ {
28+ if ( Modes is null )
29+ return ;
30+
31+ foreach ( var mode in Modes )
32+ {
33+ //if (mode.UseDefaultInactiveMode)
34+ // mode.ContentOnInactive = newValue;
35+ }
36+ }
2537 }
2638}
Original file line number Diff line number Diff line change @@ -78,6 +78,9 @@ protected override void OnApplyTemplate()
7878 Grid . SetColumn ( mode , _modesHostGrid . Children . Count ) ;
7979 _modesHostGrid . Children . Add ( mode ) ;
8080 mode . Host = this ;
81+
82+ //if (mode.UseDefaultInactiveMode)
83+ // mode.ContentOnInactive = DefaultInactiveMode;
8184 }
8285
8386 _modesHostGrid . SizeChanged += _modesHostGrid_SizeChanged ;
@@ -120,6 +123,9 @@ private void UpdateVisualStates()
120123 this ,
121124 _isFocused ? "Focused" : "Normal" ,
122125 true ) ;
126+
127+ if ( CurrentActiveMode is not null )
128+ VisualStateManager . GoToState ( CurrentActiveMode , _isFocused ? "Focused" : "CurrentUnfocused" , true ) ;
123129 }
124130
125131 // Events
Original file line number Diff line number Diff line change @@ -26,6 +26,9 @@ public partial class OmnibarMode
2626 [ GeneratedDependencyProperty ]
2727 public partial bool UseDefaultInactiveMode { get ; set ; }
2828
29+ [ GeneratedDependencyProperty ]
30+ public partial FrameworkElement ? ContentOnInactive { get ; set ; }
31+
2932 [ GeneratedDependencyProperty ]
3033 public partial FrameworkElement ? IconOnActive { get ; set ; }
3134
Original file line number Diff line number Diff line change 7676 </TextBox .Resources>
7777 </TextBox >
7878
79+ <ContentPresenter
80+ x:Name=" PART_InactiveContent"
81+ Grid.Column=" 0"
82+ Grid.ColumnSpan=" 2"
83+ HorizontalAlignment=" Stretch"
84+ VerticalAlignment=" Center"
85+ HorizontalContentAlignment=" Stretch"
86+ Content=" {Binding ContentOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
87+ Visibility=" Collapsed" />
88+
7989 <VisualStateManager .VisualStateGroups>
8090
8191 <VisualStateGroup x : Name =" PointerStates" >
95105
96106 <VisualStateGroup x : Name =" FocusStates" >
97107 <VisualState x : Name =" Unfocused" />
98- <VisualState x : Name =" CurretUnfocused " >
108+ <VisualState x : Name =" CurrentUnfocused " >
99109 <VisualState .Setters>
100- <Setter Target =" PART_InputTextBox.Visibility" Value =" Visible" />
110+ <Setter Target =" PART_ModeClickBorder.Visibility" Value =" Collapsed" />
111+ <Setter Target =" PART_InactiveContent.Visibility" Value =" Visible" />
101112 </VisualState .Setters>
102113 </VisualState >
103114 <VisualState x : Name =" Focused" >
You can’t perform that action at this time.
0 commit comments