Skip to content

Commit b76b6f4

Browse files
Fix query results font family (#17842)
1 parent 1277466 commit b76b6f4

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

src/constants/constants.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export const configMaxRecentConnections = 'maxRecentConnections';
142142
export const configCopyRemoveNewLine = 'copyRemoveNewLine';
143143
export const configSplitPaneSelection = 'splitPaneSelection';
144144
export const configShowBatchTime = 'showBatchTime';
145-
export const extConfigResultKeys = ['shortcuts', 'messagesDefaultOpen', 'resultsFontSize'];
145+
export const extConfigResultKeys = ['shortcuts', 'messagesDefaultOpen', 'resultsFontSize', 'resultsFontFamily'];
146146
export const sqlToolsServiceInstallDirConfigKey = 'installDir';
147147
export const sqlToolsServiceExecutableFilesConfigKey = 'executableFiles';
148148
export const sqlToolsServiceVersionConfigKey = 'version';

src/models/interfaces.ts

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ export interface IResultsConfig {
155155
shortcuts: { [key: string]: string };
156156
messagesDefaultOpen: boolean;
157157
resultsFontSize: number;
158+
resultsFontFamily: string;
158159
}
159160

160161
export interface ILogger {

src/models/sqlOutputContentProvider.ts

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class ResultsConfig implements Interfaces.IResultsConfig {
3636
shortcuts: { [key: string]: string };
3737
messagesDefaultOpen: boolean;
3838
resultsFontSize: number;
39+
resultsFontFamily: string;
3940
}
4041

4142
export class SqlOutputContentProvider {

src/views/htmlcontent/src/js/components/app.component.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ const template = `
5858
<div class="boxRow content horzBox slickgrid" *ngFor="let dataSet of renderedDataSets; let i = index"
5959
[style.max-height]="renderedDataSets.length > 1 ? dataSet.maxHeight + 'px' : 'inherit'"
6060
[style.min-height]="renderedDataSets.length > 1 ? dataSet.minHeight + 'px' : 'inherit'"
61-
[style.font-size]="resultsFontSize + 'px'">
61+
[style.font-size]="resultsFontSize + 'px'"
62+
[style.font-family]="resultsFontFamily">
6263
<slick-grid #slickgrid id="slickgrid_{{i}}" [columnDefinitions]="dataSet.columnDefinitions"
6364
[ngClass]="i === activeGrid ? 'active' : ''"
6465
[dataRows]="dataSet.dataRows"
@@ -369,7 +370,8 @@ export class AppComponent implements OnInit, AfterViewChecked {
369370
public complete = false;
370371
private uri: string;
371372
private hasRunQuery: boolean = false;
372-
public resultsFontSize;
373+
public resultsFontSize: number;
374+
public resultsFontFamily: string;
373375
@ViewChild('contextmenu') contextMenu: ContextMenu;
374376
@ViewChild('messagescontextmenu') messagesContextMenu: MessagesContextMenu;
375377
@ViewChildren('slickgrid') slickgrids: QueryList<SlickGrid>;
@@ -399,6 +401,7 @@ export class AppComponent implements OnInit, AfterViewChecked {
399401
this.config = config;
400402
self._messageActive = self.config.messagesDefaultOpen;
401403
self.resultsFontSize = self.config.resultsFontSize;
404+
self.resultsFontFamily = self.config.resultsFontFamily;
402405
this.shortcuts.stringCodeFor('event.toggleMessagePane').then((result) => {
403406
self.messageShortcut = result;
404407
});

0 commit comments

Comments
 (0)