Skip to content

Commit 5ace228

Browse files
committed
FIx
1 parent fb9c21e commit 5ace228

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed

eng/config/PublishData.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"Microsoft.CodeAnalysis.Remote.Workspaces": "vs-impl",
9292
"Microsoft.VisualStudio.LanguageServices.LiveShare": "vs-impl",
9393
"Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient": "vs-impl",
94-
"Microsoft.CodeAnalysis.LanguageServices.ExternalAccess.Copilot": "vs-impl",
94+
"Microsoft.VisualStudio.LanguageServices.ExternalAccess.Copilot": "vs-impl",
9595
"Microsoft.CommonLanguageServerProtocol.Framework": "vs-impl",
9696
"Microsoft.CommonLanguageServerProtocol.Framework.Binary": "vs-impl"
9797
}

eng/targets/Settings.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageTags>Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics</PackageTags>
99
<ThirdPartyNoticesFilePath>$(MSBuildThisFileDirectory)..\..\src\NuGet\ThirdPartyNotices.rtf</ThirdPartyNoticesFilePath>
1010

11-
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
11+
<VSSDKTargetPlatformRegRootSuffix>Exp</VSSDKTargetPlatformRegRootSuffix>
1212

1313
<!-- Workaround for old Microsoft.VisualStudio.Progression.* packages -->
1414
<NoWarn>$(NoWarn);VSIXCompatibility1001</NoWarn>

src/VisualStudio/CSharp/Impl/SemanticSearch/SemanticSearchToolWindowImpl.cs

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,26 +199,47 @@ public async Task<FrameworkElement> InitializeAsync(CancellationToken cancellati
199199
return null;
200200
}
201201

202-
var grid = new Grid();
202+
var outerGrid = new Grid();
203203

204-
grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
205-
grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
204+
ImageThemingUtilities.SetImageBackgroundColor(outerGrid, (Color)Application.Current.Resources[CommonDocumentColors.PageBackgroundColorKey]);
205+
ThemedDialogStyleLoader.SetUseDefaultThemedDialogStyles(outerGrid, true);
206206

207-
var inputTextBox = copilotUIProvider.GetTextBox();
207+
// [ prompt border | empty ]
208+
outerGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
209+
outerGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
208210

209-
Grid.SetColumn(inputTextBox.Control, 0);
210-
grid.Children.Add(inputTextBox.Control);
211+
var promptGrid = new Grid();
212+
213+
// [ input | panel ]
214+
promptGrid.ColumnDefinitions.Add(new ColumnDefinition { MaxWidth = 600, Width = GridLength.Auto });
215+
promptGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
216+
217+
var promptTextBox = copilotUIProvider.GetTextBox();
211218

212219
var panel = new StackPanel()
213220
{
214221
Orientation = Orientation.Horizontal,
215-
HorizontalAlignment = HorizontalAlignment.Right,
222+
HorizontalAlignment = HorizontalAlignment.Left,
216223
VerticalAlignment = VerticalAlignment.Bottom,
217224
Margin = new Thickness(8, 8, 0, 8),
218225
};
219226

227+
Grid.SetColumn(promptTextBox.Control, 0);
228+
promptGrid.Children.Add(promptTextBox.Control);
229+
220230
Grid.SetColumn(panel, 1);
221-
grid.Children.Add(panel);
231+
promptGrid.Children.Add(panel);
232+
233+
var promptGridBorder = new Border
234+
{
235+
Name = "PromptBorder",
236+
BorderBrush = (Brush)Application.Current.Resources[EnvironmentColors.SystemHighlightBrushKey],
237+
BorderThickness = new Thickness(1),
238+
Child = promptGrid
239+
};
240+
241+
Grid.SetColumn(promptGridBorder, 0);
242+
outerGrid.Children.Add(promptGridBorder);
222243

223244
// ComboBox for model selection
224245
var modelPicker = new ComboBox
@@ -253,12 +274,12 @@ public async Task<FrameworkElement> InitializeAsync(CancellationToken cancellati
253274

254275
panel.Children.Add(submitButton);
255276

256-
submitButton.Click += (_, _) => SubmitCopilotQuery(inputTextBox.Text, modelPicker.Text);
277+
submitButton.Click += (_, _) => SubmitCopilotQuery(promptTextBox.Text, modelPicker.Text);
257278

258279
return new CopilotUI()
259280
{
260-
Control = grid,
261-
Input = inputTextBox,
281+
Control = outerGrid,
282+
Input = promptTextBox,
262283
ModelPicker = modelPicker,
263284
};
264285
}

0 commit comments

Comments
 (0)