@@ -59,7 +59,9 @@ private void TextBox_KeyDown(object sender, KeyRoutedEventArgs e)
5959 {
6060 if ( e . Key == Windows . System . VirtualKey . Enter )
6161 {
62- StartToSearch ( ) ;
62+ MainWindow mainWindow = App . GetWindowForElement ( this ) ;
63+ StartSearch ( SearchBox . Text , mainWindow ) ;
64+ SearchBox . Text = string . Empty ;
6365 }
6466 }
6567
@@ -78,33 +80,30 @@ private void SuggestItemClick(object sender, ItemClickEventArgs e)
7880 SearchBox . Text = $ "{ prefix } { item } ";
7981 }
8082
81- private void StartToSearch ( )
83+ public static void StartSearch ( string text , MainWindow mainWindow )
8284 {
83- string text = SearchBox . Text ;
84- SearchBox . Text = string . Empty ;
8585 UriType uriType = text . DetectUri ( ) ;
8686 if ( uriType == UriType . WithProtocol )
8787 {
88- Navigate ( text ) ;
88+ Navigate ( text , mainWindow ) ;
8989 }
9090 else if ( uriType == UriType . WithoutProtocol )
9191 {
92- Navigate ( "https://" + text ) ;
92+ Navigate ( "https://" + text , mainWindow ) ;
9393 }
9494 else if ( File . Exists ( text ) )
9595 {
9696 FileInfo fileInfo = new ( text ) ;
9797 string ext = fileInfo . Extension ;
98- MainWindow mainWindow = App . GetWindowForElement ( this ) ;
9998 if ( Info . LanguageDict . TryGetValue ( ext , out var _ ) )
10099 {
101100 if ( ext == ".lnk" )
102101 {
103- mainWindow . AddNewTab ( new InkFilePage ( text ) , fileInfo . Name ) ;
102+ mainWindow . AddNewTab ( new InkFilePage ( fileInfo ) , fileInfo . Name ) ;
104103 }
105104 else
106105 {
107- mainWindow . AddNewTab ( new TextFilePage ( text ) , fileInfo . Name ) ;
106+ mainWindow . AddNewTab ( new TextFilePage ( fileInfo ) , fileInfo . Name ) ;
108107 }
109108 }
110109 else if ( Info . ImageDict . TryGetValue ( ext , out var _ ) )
@@ -113,27 +112,25 @@ private void StartToSearch()
113112 }
114113 else
115114 {
116- Navigate ( text ) ;
115+ Navigate ( text , mainWindow ) ;
117116 }
118117 }
119118 else
120119 {
121- Navigate ( Info . SearchEngineList . First ( x => x . Name == App . settings . SearchEngine ) . Uri + text ) ;
120+ Navigate ( Info . SearchEngineList . First ( x => x . Name == App . settings . SearchEngine ) . Uri + text , mainWindow ) ;
122121 }
123122 }
124123
125- private void Navigate ( string site )
124+ public static void Navigate ( string site , MainWindow mainWindow )
126125 {
127126 Uri uri = new ( site ) ;
128- MainWindow mainWindow = App . GetWindowForElement ( this ) ;
129- var selectedItem = mainWindow . SelectedItem ;
130- if ( selectedItem is WebViewPage webviewPage )
127+ if ( ( mainWindow . TabView . SelectedItem != null ) && ( mainWindow . SelectedItem is WebViewPage webviewPage ) )
131128 {
132- webviewPage . WebUri = uri ;
129+ webviewPage . webView2 . Source = uri ;
133130 }
134131 else
135132 {
136- mainWindow . AddNewTab ( new WebViewPage ( ) { WebUri = uri } ) ;
133+ mainWindow . AddNewTab ( new WebViewPage ( uri ) ) ;
137134 }
138135 }
139136
0 commit comments