timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-23 03:20:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(1.116): update patches (#2796)

Browse Source
This commit is contained in:
Baptiste Augrain
2026-04-22 01:54:37 +02:00
committed by GitHub
parent 3db4d595d6
commit caebfcd986
23 changed files with 6019 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
patches/feat-experimental-font.patch
View File

@@ -1,5 +1,5 @@
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index e9e55ad..0ce9147 100644
index e9e55ad9..0ce9147c 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -127 +127,72 @@
@@ -77,10 +77,10 @@ index e9e55ad..0ce9147 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css
index 8496f1b..964455a 100644
index 0ec4cbb4..0fc77fae 100644
--- a/src/vs/base/browser/ui/button/button.css
+++ b/src/vs/base/browser/ui/button/button.css
@@ -183 +183,43 @@
@@ -184 +184,43 @@
}
+
+
@@ -126,7 +126,7 @@ index 8496f1b..964455a 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.css b/src/vs/base/browser/ui/codicons/codicon/codicon.css
index d7f257d..af55bdd 100644
index d7f257db..af55bddb 100644
--- a/src/vs/base/browser/ui/codicons/codicon/codicon.css
+++ b/src/vs/base/browser/ui/codicons/codicon/codicon.css
@@ -25 +25,7 @@
@@ -139,7 +139,7 @@ index d7f257d..af55bdd 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css
index d3dfd9a..cf59627 100644
index d3dfd9a5..cf596272 100644
--- a/src/vs/base/browser/ui/iconLabel/iconlabel.css
+++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css
@@ -119 +119,21 @@
@@ -166,7 +166,7 @@ index d3dfd9a..cf59627 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index dc5e637..b580762 100644
index dc5e637f..b580762b 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -107 +107,28 @@
@@ -200,7 +200,7 @@ index dc5e637..b580762 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
index fd4d00e..92ddc99 100644
index fd4d00ea..92ddc996 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.css
+++ b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -35 +35,16 @@
@@ -222,7 +222,7 @@ index fd4d00e..92ddc99 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index b7cbca1..16f531c 100644
index b7cbca15..16f531cb 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -8,2 +8,3 @@ import * as arrays from '../../../common/arrays.js';
@@ -235,7 +235,7 @@ index b7cbca1..16f531c 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/base/browser/ui/splitview/paneview.css b/src/vs/base/browser/ui/splitview/paneview.css
index 7bb4282..92c027a 100644
index 7bb4282a..92c027a2 100644
--- a/src/vs/base/browser/ui/splitview/paneview.css
+++ b/src/vs/base/browser/ui/splitview/paneview.css
@@ -153 +153,38 @@
@@ -279,7 +279,7 @@ index 7bb4282..92c027a 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/splitview/paneview.ts b/src/vs/base/browser/ui/splitview/paneview.ts
index fb2e1f4..3b1e23f 100644
index fb2e1f40..3b1e23f2 100644
--- a/src/vs/base/browser/ui/splitview/paneview.ts
+++ b/src/vs/base/browser/ui/splitview/paneview.ts
@@ -21,2 +21,3 @@ import { IView, Sizing, SplitView } from './splitview.js';
@@ -302,7 +302,7 @@ index fb2e1f4..3b1e23f 100644
+ const headerSize = this.headerSize;
diff --git a/src/vs/base/browser/ui/toggle/toggle.css b/src/vs/base/browser/ui/toggle/toggle.css
index e2d206d..e69352c 100644
index e2d206d3..e69352c8 100644
--- a/src/vs/base/browser/ui/toggle/toggle.css
+++ b/src/vs/base/browser/ui/toggle/toggle.css
@@ -69 +69,27 @@
@@ -335,7 +335,7 @@ index e2d206d..e69352c 100644
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/toggle/toggle.ts b/src/vs/base/browser/ui/toggle/toggle.ts
index 0b2fcbb..6370e6f 100644
index 0b2fcbbb..6370e6f7 100644
--- a/src/vs/base/browser/ui/toggle/toggle.ts
+++ b/src/vs/base/browser/ui/toggle/toggle.ts
@@ -5,2 +5,3 @@
@@ -350,7 +350,7 @@ index 0b2fcbb..6370e6f 100644
}
diff --git a/src/vs/base/common/font.ts b/src/vs/base/common/font.ts
new file mode 100644
index 0000000..8b9689c
index 00000000..8b9689c7
--- /dev/null
+++ b/src/vs/base/common/font.ts
@@ -0,0 +1,187 @@
@@ -544,7 +544,7 @@ index 0000000..8b9689c
\ No newline at end of file
diff --git a/src/vs/base/test/common/font.test.ts b/src/vs/base/test/common/font.test.ts
new file mode 100644
index 0000000..62a49d5
index 00000000..62a49d53
--- /dev/null
+++ b/src/vs/base/test/common/font.test.ts
@@ -0,0 +1,482 @@
@@ -1031,7 +1031,7 @@ index 0000000..62a49d5
+ });
+});
diff --git a/src/vs/platform/quickinput/browser/tree/quickInputDelegate.ts b/src/vs/platform/quickinput/browser/tree/quickInputDelegate.ts
index 328285f..0735dfa 100644
index 328285f0..0735dfa2 100644
--- a/src/vs/platform/quickinput/browser/tree/quickInputDelegate.ts
+++ b/src/vs/platform/quickinput/browser/tree/quickInputDelegate.ts
@@ -6,2 +6,3 @@
@@ -1044,7 +1044,7 @@ index 328285f..0735dfa 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 0d6a2da..6127a14 100644
index 1f6e583f..79401713 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -11,20 +11,20 @@
@@ -1089,7 +1089,7 @@ index 0d6a2da..6127a14 100644
+ font-family: var(--vscode-workbench-font-family, var(--monaco-font));
+ font-size: var(--vscode-workbench-font-size, 13px);
@@ -335 +337,41 @@ body {
@@ -356 +358,41 @@ body {
}
+
+
@@ -1133,33 +1133,33 @@ index 0d6a2da..6127a14 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 0307cab..5e5f6f3 100644
index 86c8b184..bfd30e64 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -40,2 +40,3 @@ import { IViewsService } from '../../../services/views/common/viewsService.js';
@@ -41,2 +41,3 @@ import { IViewsService } from '../../../services/views/common/viewsService.js';
import { SwitchCompositeViewAction } from '../compositeBarActions.js';
+import { FONT, getFontSize, updateActivityBarSize } from '../../../../base/common/font.js';
@@ -45,2 +46,3 @@ export class ActivitybarPart extends Part {
@@ -46,2 +47,3 @@ export class ActivitybarPart extends Part {
static readonly COMPACT_ACTION_HEIGHT = 32;
+ static readonly COMPACT_ACTION_HEIGHT_RATIO = 32/48;
@@ -48,2 +50,3 @@ export class ActivitybarPart extends Part {
@@ -49,2 +51,3 @@ export class ActivitybarPart extends Part {
static readonly COMPACT_ACTIVITYBAR_WIDTH = 36;
+ static readonly COMPACT_ACTIVITYBAR_WIDTH_RATIO = 36/48;
@@ -51,2 +54,3 @@ export class ActivitybarPart extends Part {
@@ -52,2 +55,3 @@ export class ActivitybarPart extends Part {
static readonly COMPACT_ICON_SIZE = 16;
+ static readonly COMPACT_ICON_SIZE_RATIO = 16/24;
@@ -58,4 +62,4 @@ export class ActivitybarPart extends Part {
@@ -59,4 +63,4 @@ export class ActivitybarPart extends Part {
- get minimumWidth(): number { return this._isCompact ? ActivitybarPart.COMPACT_ACTIVITYBAR_WIDTH : ActivitybarPart.ACTIVITYBAR_WIDTH; }
- get maximumWidth(): number { return this._isCompact ? ActivitybarPart.COMPACT_ACTIVITYBAR_WIDTH : ActivitybarPart.ACTIVITYBAR_WIDTH; }
+ get minimumWidth(): number { return this._isCompact ? FONT.activityBarSize48 * ActivitybarPart.COMPACT_ACTIVITYBAR_WIDTH_RATIO : FONT.activityBarSize48; }
+ get maximumWidth(): number { return this._isCompact ? FONT.activityBarSize48 * ActivitybarPart.COMPACT_ACTIVITYBAR_WIDTH_RATIO : FONT.activityBarSize48; }
readonly minimumHeight: number = 0;
@@ -90,2 +94,11 @@ export class ActivitybarPart extends Part {
@@ -91,2 +95,11 @@ export class ActivitybarPart extends Part {
}));
+
+ this._register(configurationService.onDidChangeConfiguration(e => {
@@ -1171,21 +1171,21 @@ index 0307cab..5e5f6f3 100644
+ }
+ }));
}
@@ -96,4 +109,4 @@ export class ActivitybarPart extends Part {
@@ -97,4 +110,4 @@ export class ActivitybarPart extends Part {
this.element.style.setProperty('--activity-bar-width', `${this.minimumWidth}px`);
- this.element.style.setProperty('--activity-bar-action-height', `${this._isCompact ? ActivitybarPart.COMPACT_ACTION_HEIGHT : ActivitybarPart.ACTION_HEIGHT}px`);
- this.element.style.setProperty('--activity-bar-icon-size', `${this._isCompact ? ActivitybarPart.COMPACT_ICON_SIZE : ActivitybarPart.ICON_SIZE}px`);
+ this.element.style.setProperty('--activity-bar-action-height', `${this._isCompact ? FONT.activityBarSize32 : FONT.activityBarSize48}px`);
+ this.element.style.setProperty('--activity-bar-icon-size', `${this._isCompact ? FONT.activityBarSize : FONT.activityBarSize24}px`);
}
@@ -153,2 +166,6 @@ export class ActivitybarPart extends Part {
@@ -154,2 +167,6 @@ export class ActivitybarPart extends Part {
+ // Apply font settings before show() so composite bar uses correct sizes
+ this.applyActivityBarFontFamily(parent);
+ this.applyActivityBarFontSize(parent);
+
this.updateCompactStyle();
@@ -162,2 +179,34 @@ export class ActivitybarPart extends Part {
@@ -163,2 +180,34 @@ export class ActivitybarPart extends Part {
+ private applyActivityBarFontFamily(container?: HTMLElement): void {
+ const target = container ?? this.getContainer();
@@ -1221,7 +1221,7 @@ index 0307cab..5e5f6f3 100644
+
getPinnedPaneCompositeIds(): string[] {
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index a40a351..51eb067 100644
index a40a3515..51eb067d 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -230 +230,60 @@
@@ -1287,7 +1287,7 @@ index a40a351..51eb067 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
index 568a721..b3d7e50 100644
index 568a7212..b3d7e506 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
@@ -8,2 +8,4 @@
@@ -1306,7 +1306,7 @@ index 568a721..b3d7e50 100644
+ height: calc(var(--vscode-workbench-activitybar-font-size) * 2.1875);
}
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
index d32082b..ad7e524 100644
index d32082b4..ad7e524c 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
@@ -36,2 +36,4 @@ import { VisibleViewContainersTracker } from '../visibleViewContainersTracker.js
@@ -1362,7 +1362,7 @@ index d32082b..ad7e524 100644
+ this._onDidChange.fire(undefined); // Signal grid that size constraints changed
}
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
index aec3de2..b0e1fd8 100644
index aec3de2d..b0e1fd8f 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
+++ b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
@@ -28,2 +28,8 @@
@@ -1375,7 +1375,7 @@ index aec3de2..b0e1fd8 100644
+
.monaco-workbench .part.auxiliarybar > .title > .title-label {
diff --git a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
index b0a44e2..e711a80 100644
index b0a44e2c..e711a809 100644
--- a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
@@ -48,2 +48,4 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
@@ -1451,7 +1451,7 @@ index b0a44e2..e711a80 100644
+
private get editorActionsEnabled(): boolean {
diff --git a/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
index 57ab8ca..72a328f 100644
index 57ab8ca5..72a328fc 100644
--- a/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
@@ -9,2 +9,3 @@
@@ -1498,7 +1498,7 @@ index 57ab8ca..72a328f 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/editortitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/editortitlecontrol.css
index a24f761..6b15b9c 100644
index a24f7613..6b15b9c2 100644
--- a/src/vs/workbench/browser/parts/editor/media/editortitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/editortitlecontrol.css
@@ -47 +47,28 @@
@@ -1532,7 +1532,7 @@ index a24f761..6b15b9c 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index 4f9477d..b47fd85 100644
index 4f9477d0..b47fd85b 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -176,4 +176,4 @@
@@ -1663,7 +1663,7 @@ index 4f9477d..b47fd85 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index b0befd9..7c25771 100644
index b56047d6..d6e6c7ed 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -6,2 +6,3 @@
@@ -1697,7 +1697,7 @@ index b0befd9..7c25771 100644
+ super(parent, editorPartsView, groupsView, groupView, tabsModel, contextMenuService, instantiationService, contextKeyService, keybindingService, notificationService, quickInputService, themeService, editorResolverService, hostService, configurationService);
diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index fe0f2ad..195267c 100644
index fe0f2adf..195267cf 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -369 +369,119 @@
@@ -1822,7 +1822,7 @@ index fe0f2ad..195267c 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index e1c147d..63d0e10 100644
index e1c147d8..63d0e109 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -10,2 +10,7 @@
@@ -1887,7 +1887,7 @@ index e1c147d..63d0e10 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 9afcf59..a8d4c2e 100644
index 9afcf596..a8d4c2e6 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -34,2 +34,3 @@ import { IConfigurationService } from '../../../../platform/configuration/common
@@ -1942,7 +1942,7 @@ index 9afcf59..a8d4c2e 100644
+ this._onDidChange.fire(undefined); // Signal grid that size constraints changed
}
diff --git a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
index decb51a..d0db436 100644
index decb51ab..d0db4363 100644
--- a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
+++ b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
@@ -15,3 +15,3 @@
@@ -1999,7 +1999,7 @@ index decb51a..d0db436 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index 101b9c6..970cdaa 100644
index 101b9c6c..970cdaae 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -36,2 +36,3 @@ import { VisibleViewContainersTracker } from '../visibleViewContainersTracker.js
@@ -2061,7 +2061,7 @@ index 101b9c6..970cdaa 100644
+
private registerActions(): void {
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index 1f3b102..42ad22c 100644
index 1f3b102e..42ad22c0 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -11,2 +11,3 @@
@@ -2141,7 +2141,7 @@ index 1f3b102..42ad22c 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 18340a8..0a33ce0 100644
index 18340a8a..0a33ce06 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -38,2 +38,4 @@ import { IView } from '../../../../base/browser/ui/grid/grid.js';
@@ -2237,7 +2237,7 @@ index 18340a8..0a33ce0 100644
+ super(`workbench.parts.auxiliaryStatus.${id}`, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, configurationService);
}
diff --git a/src/vs/workbench/browser/parts/views/media/paneviewlet.css b/src/vs/workbench/browser/parts/views/media/paneviewlet.css
index aca98de..5bf9bf7 100644
index aca98deb..5bf9bf71 100644
--- a/src/vs/workbench/browser/parts/views/media/paneviewlet.css
+++ b/src/vs/workbench/browser/parts/views/media/paneviewlet.css
@@ -87 +87,30 @@
@@ -2273,7 +2273,7 @@ index aca98de..5bf9bf7 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 1c9305b..6471a0d 100644
index 1c9305bd..6471a0d3 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -79,2 +79,3 @@ import { IAccessibleViewInformationService } from '../../../services/accessibili
@@ -2290,10 +2290,10 @@ index 1c9305b..6471a0d 100644
- static readonly ITEM_HEIGHT = 22;
static readonly TREE_TEMPLATE_ID = 'treeExplorer';
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index 058693c..ee81a59 100644
index bdc603ff..4bc6d153 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -702,2 +702,85 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
@@ -698,2 +698,85 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
},
+ 'workbench.experimental.fontFamily': {
+ type: 'string',
@@ -2380,7 +2380,7 @@ index 058693c..ee81a59 100644
+ },
'workbench.settings.editor': {
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
index 10e2c3e..74e3bbe 100644
index 10e2c3ed..74e3bbe9 100644
--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -9,2 +9,3 @@ import { Event, Emitter, setGlobalLeakWarningThreshold } from '../../base/common
@@ -2460,7 +2460,7 @@ index 10e2c3e..74e3bbe 100644
+ this.updateFontSize(configurationService);
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
index 6f58865..3ab0ee4 100644
index 6f588651..3ab0ee4e 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
@@ -17,2 +17,3 @@ import { localize } from '../../../../nls.js';
@@ -2473,43 +2473,31 @@ index 6f58865..3ab0ee4 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
index bcb46c6..0aef82b 100644
index d4f277de..4f386424 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
@@ -52,2 +52,3 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
import { ILogService } from '../../../../../platform/log/common/log.js';
@@ -53,2 +53,3 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
import { compareIgnoreCase } from '../../../../../base/common/strings.js';
+import { FONT } from '../../../../../base/common/font.js';
@@ -638,5 +639,2 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
@@ -838,5 +839,2 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
- static readonly ITEM_HEIGHT = 54;
- static readonly SECTION_HEIGHT = 26;
-
constructor(private readonly _approvalModel?: AgentSessionApprovalModel) { }
@@ -645,6 +643,6 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
constructor(private readonly _approvalModel?: AgentSessionApprovalModel,
@@ -847,3 +845,3 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
if (isAgentSessionSection(element)) {
- return AgentSessionsListDelegate.SECTION_HEIGHT;
+ return FONT.sidebarSize26;
}
@@ -854,3 +852,3 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
- let height = AgentSessionsListDelegate.ITEM_HEIGHT;
+ let height = FONT.sidebarSize54;
const approval = this._approvalModel?.getApproval(element.resource).get();
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
index ad2c82a..6cb6bce 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
@@ -34,2 +34,3 @@ import { IContextKey, IContextKeyService } from '../../../../../platform/context
import { CONTEXT_MODELS_EDITOR } from '../../common/constants.js';
+import { FONT } from '../../../../../base/common/font.js';
@@ -439,3 +440,3 @@ class SectionItemDelegate implements IListVirtualDelegate<SectionItem> {
getHeight(element: SectionItem) {
- return 22;
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
index cc7bb15..f260d0e 100644
index cc7bb156..f260d0e3 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
@@ -33,2 +33,3 @@ import { ResourcePool } from './chatCollections.js';
@@ -2522,7 +2510,7 @@ index cc7bb15..f260d0e 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts
index 15ae799..06a95d5 100644
index 15ae7996..06a95d59 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts
@@ -36,2 +36,3 @@ import { ChatTreeItem } from '../../chat.js';
@@ -2535,7 +2523,7 @@ index 15ae799..06a95d5 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
index 8493938..50a19e4 100644
index 84939387..50a19e4f 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
@@ -50,2 +50,3 @@ import { IHoverService } from '../../../../../../platform/hover/browser/hover.js
@@ -2548,20 +2536,20 @@ index 8493938..50a19e4 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTodoListWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTodoListWidget.ts
index 619d00a..9edbd1b 100644
index 8f0f2c48..52818d1d 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTodoListWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTodoListWidget.ts
@@ -11,2 +11,3 @@ import { IListRenderer, IListVirtualDelegate } from '../../../../../../base/brow
import { Codicon } from '../../../../../../base/common/codicons.js';
+import { FONT } from '../../../../../../base/common/font.js';
import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
@@ -23,3 +24,3 @@ class TodoListDelegate implements IListVirtualDelegate<IChatTodo> {
@@ -24,3 +25,3 @@ class TodoListDelegate implements IListVirtualDelegate<IChatTodo> {
getHeight(element: IChatTodo): number {
- return 22;
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts
index 703940e..e0fa9eb 100644
index 703940ed..e0fa9eb5 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts
@@ -12,2 +12,3 @@ import { IAsyncDataSource, ITreeNode } from '../../../../../../base/browser/ui/t
@@ -2577,7 +2565,7 @@ index 703940e..e0fa9eb 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
index 83799c1..b2d3db2 100644
index 83799c15..b2d3db2c 100644
--- a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
@@ -169 +169,68 @@
@@ -2651,7 +2639,7 @@ index 83799c1..b2d3db2 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
index c6298b3..8fcab5f 100644
index c6298b30..8fcab5f3 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
@@ -15,2 +15,3 @@ import { safeIntl } from '../../../../../base/common/date.js';
@@ -2664,7 +2652,7 @@ index c6298b3..8fcab5f 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
index cacba31..7785734 100644
index cacba319..77857347 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -40,2 +40,3 @@ import { SelectionClipboardContributionID } from '../selectionClipboard.js';
@@ -2679,14 +2667,14 @@ index cacba31..7785734 100644
+ lineHeight: FONT.sidebarSize20,
wordWrap: 'off',
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index b5234b6..b36e465 100644
index 5162553b..5adbed8f 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -43,2 +43,3 @@ import { MarshalledCommentThread, MarshalledCommentThreadInternal } from '../../
import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { FONT } from '../../../../base/common/font.js';
@@ -83,5 +84,5 @@ class CommentsModelVirtualDelegate implements IListVirtualDelegate<ResourceWithC
@@ -84,5 +85,5 @@ class CommentsModelVirtualDelegate implements IListVirtualDelegate<ResourceWithC
if ((element instanceof CommentNode) && element.hasReply()) {
- return 44;
+ return FONT.sidebarSize44;
@@ -2695,7 +2683,7 @@ index b5234b6..b36e465 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 6f82df1..6c8ae0d 100644
index 6f82df16..6c8ae0d6 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -63,2 +63,3 @@ import { equals } from '../../../../base/common/arrays.js';
@@ -2708,7 +2696,7 @@ index 6f82df1..6c8ae0d 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 35c9c1e..f8bf9c5 100644
index 35c9c1e5..f8bf9c5b 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -22,2 +22,3 @@ import { Event } from '../../../../base/common/event.js';
@@ -2729,7 +2717,7 @@ index 35c9c1e..f8bf9c5 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
index 42e4cbe..bfaf21e 100644
index 42e4cbeb..bfaf21e4 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
@@ -13,2 +13,3 @@ import { Codicon } from '../../../../base/common/codicons.js';
@@ -2757,7 +2745,7 @@ index 42e4cbe..bfaf21e 100644
-
interface IAbstractFrameRendererTemplateData {
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
index fe8ae2b..5830976 100644
index fe8ae2b6..5830976e 100644
--- a/src/vs/workbench/contrib/debug/browser/debugHover.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -15,2 +15,3 @@ import { coalesce } from '../../../../base/common/arrays.js';
@@ -2770,7 +2758,7 @@ index fe8ae2b..5830976 100644
+ return FONT.sidebarSize18;
}
diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
index 531c114..909a66d 100644
index 531c1146..909a66db 100644
--- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
@@ -14,2 +14,3 @@ import { Codicon } from '../../../../base/common/codicons.js';
@@ -2783,7 +2771,7 @@ index 531c114..909a66d 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
index ca34e6f..611b495 100644
index ca34e6f7..611b4950 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
@@ -55 +55,25 @@
@@ -2814,7 +2802,7 @@ index ca34e6f..611b495 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
index 4a627af..86f37c5 100644
index 4a627af1..86f37c5a 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -371 +371,103 @@
@@ -2923,7 +2911,7 @@ index 4a627af..86f37c5 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index f18d41b..8863b19 100644
index f18d41bf..8863b19d 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -18,2 +18,3 @@ import { Codicon } from '../../../../base/common/codicons.js';
@@ -2936,7 +2924,7 @@ index f18d41b..8863b19 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index f290f70..3269808 100644
index f290f709..3269808a 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -42,2 +42,3 @@ import { watchExpressionsAdd, watchExpressionsRemoveAll } from './debugIcons.js'
@@ -2949,7 +2937,7 @@ index f290f70..3269808 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
index 3cd48a5..3238df4 100644
index 3cd48a5b..3238df42 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
@@ -40,2 +40,3 @@ import { IHoverService } from '../../../../platform/hover/browser/hover.js';
@@ -2962,7 +2950,7 @@ index 3cd48a5..3238df4 100644
+ getHeight() { return FONT.sidebarSize22; }
getTemplateId() { return 'extensionFeatureDescriptor'; }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index 42134f0..4e14bd1 100644
index 42134f0b..4e14bd16 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -27,4 +27,3 @@ import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/ac
@@ -2977,7 +2965,7 @@ index 42134f0..4e14bd1 100644
+ getHeight() { return FONT.sidebarSize72; }
getTemplateId() { return 'extension'; }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
index 418cb12..fbb30c5 100644
index 418cb12e..fbb30c5c 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
@@ -40,2 +40,3 @@ import { ILogService } from '../../../../platform/log/common/log.js';
@@ -2990,7 +2978,7 @@ index 418cb12..fbb30c5 100644
+ return FONT.sidebarSize62;
}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 8bfac42..6430bf4 100644
index 8bfac429..6430bf43 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -69,2 +69,3 @@ import { URI } from '../../../../base/common/uri.js';
@@ -3007,7 +2995,7 @@ index 8bfac42..6430bf4 100644
+ const headerHeight = this.header && !!this.notificationContainer?.childNodes.length ? this.notificationContainer.clientHeight + searchBoxHeight + FONT.sidebarSize10 /*margin*/ : searchBoxHeight;
this.header!.style.height = `${headerHeight}px`;
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index 8454447..733b9a6 100644
index 84544479..733b9a6b 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -302 +302,91 @@
@@ -3104,7 +3092,7 @@ index 8454447..733b9a6 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
index 6326d45..cc5242a 100644
index 6326d45f..cc5242ae 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
@@ -166 +166,26 @@
@@ -3136,7 +3124,7 @@ index 6326d45..cc5242a 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
index db5712f..0f75b63 100644
index db5712fe..0f75b632 100644
--- a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
+++ b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
@@ -108 +108,24 @@
@@ -3166,7 +3154,7 @@ index db5712f..0f75b63 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index 5b11568..d276b5c 100644
index 5b115684..d276b5c9 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -511,3 +511,3 @@ export class ExplorerView extends ViewPane implements IExplorerView {
@@ -3175,7 +3163,7 @@ index 5b11568..d276b5c 100644
+ paddingBottom: ExplorerDelegate.getHeight(),
overrideStyles: this.getLocationBasedColors().listOverrideStyles,
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index ed7dbe0..dba05e8 100644
index ed7dbe07..dba05e80 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -76,2 +76,3 @@ import { listFilterMatchHighlight, listFilterMatchHighlightBorder } from '../../
@@ -3199,7 +3187,7 @@ index ed7dbe0..dba05e8 100644
+ const offset = Math.max(39 - indent, 0); // derived via inspection
container.style.setProperty(`--vscode-explorer-align-offset-margin-left`, `${offset}px`);
diff --git a/src/vs/workbench/contrib/files/browser/views/media/openeditors.css b/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
index d933ff9..3995b14 100644
index d933ff97..3995b14f 100644
--- a/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
+++ b/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
@@ -108 +108,28 @@
@@ -3233,7 +3221,7 @@ index d933ff9..3995b14 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index 7229c14..33cae40 100644
index 7229c14b..33cae40e 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -58,2 +58,3 @@ import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
@@ -3259,7 +3247,7 @@ index 7229c14..33cae40 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts b/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts
index f16d9fa..3296abc 100644
index f16d9fa5..3296abc7 100644
--- a/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts
@@ -28,2 +28,3 @@ import { ExplorerFindProvider, FilesFilter } from '../../browser/views/explorerV
@@ -3272,7 +3260,7 @@ index f16d9fa..3296abc 100644
+ getHeight() { return FONT.sidebarSize20; }
getTemplateId(element: ExplorerItem): string { return 'default'; }
diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 0176fb6..140cda1 100644
index 0176fb67..140cda1d 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -54,2 +54,3 @@ import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
@@ -3298,7 +3286,7 @@ index 0176fb6..140cda1 100644
+ lineElement.style.height = `${FONT.sidebarSize22}px`;
}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
index 4c95a37..fcb18e0 100644
index 4c95a373..fcb18e0e 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
@@ -10,2 +10,3 @@ import { ITreeNode, ITreeRenderer } from '../../../../../../base/browser/ui/tree
@@ -3311,7 +3299,7 @@ index 4c95a37..fcb18e0 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
index d812034..e2affd5 100644
index d812034b..e2affd59 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -56,2 +56,3 @@ import { ILanguageFeaturesService } from '../../../../../../editor/common/servic
@@ -3324,7 +3312,7 @@ index d812034..e2affd5 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/preferences/browser/tocTree.ts b/src/vs/workbench/contrib/preferences/browser/tocTree.ts
index 0078e1e..b40fa10 100644
index 0078e1ea..b40fa10d 100644
--- a/src/vs/workbench/contrib/preferences/browser/tocTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/tocTree.ts
@@ -11,2 +11,3 @@ import { RenderIndentGuides } from '../../../../base/browser/ui/tree/abstractTre
@@ -3337,7 +3325,7 @@ index 0078e1e..b40fa10 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts b/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts
index b54812a..05e5f75 100644
index b54812a0..05e5f75b 100644
--- a/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts
+++ b/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts
@@ -35,2 +35,3 @@ import { Schemas } from '../../../../base/common/network.js';
@@ -3350,7 +3338,7 @@ index b54812a..05e5f75 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 530b0c4..b3c979d 100644
index 2d7e4bb9..f4a5a5c1 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -57,2 +57,3 @@ import { mainWindow } from '../../../../base/browser/window.js';
@@ -3363,7 +3351,7 @@ index 530b0c4..b3c979d 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index 408b771..7ccc6b9 100644
index 408b771f..7ccc6b93 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -800 +800,215 @@
@@ -3584,7 +3572,7 @@ index 408b771..7ccc6b9 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index ab1900f..5ea8f3c 100644
index 88c5c132..cd2b3759 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -77,2 +77,3 @@ import { IMarkdownRendererService } from '../../../../platform/markdown/browser/
@@ -3597,7 +3585,7 @@ index ab1900f..5ea8f3c 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
index 1523a82..fe78847 100644
index 1523a82c..fe788478 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -49,2 +49,3 @@ import { IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/a
@@ -3610,7 +3598,7 @@ index 1523a82..fe78847 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index a2887d4..5e81511 100644
index a2887d47..5e81511f 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -77,2 +77,3 @@ import { AccessibilityCommandId } from '../../accessibility/common/accessibility
@@ -3656,7 +3644,7 @@ index a2887d4..5e81511 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index 47e85d6..977a4dc 100644
index 47e85d64..977a4dc6 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -443 +443,121 @@
@@ -3783,7 +3771,7 @@ index 47e85d6..977a4dc 100644
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/search/browser/searchResultsView.ts b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
index 62d5db9..f86dba1 100644
index 62d5db99..f86dba1f 100644
--- a/src/vs/workbench/contrib/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
@@ -36,2 +36,3 @@ import { ISearchTreeMatch, isSearchTreeMatch, RenderableMatch, ITextSearchHeadin
@@ -3802,7 +3790,7 @@ index 62d5db9..f86dba1 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index fb52bbb..09ca311 100644
index fb52bbb7..09ca3111 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -87,2 +87,3 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
@@ -3834,7 +3822,7 @@ index fb52bbb..09ca311 100644
+ this.tree.layout(this.size.height - widgetHeight - messagesHeight, this.size.width - FONT.sidebarSize28);
}
diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts
index e9c0fcd..f3e23de 100644
index e9c0fcd4..f3e23de0 100644
--- a/src/vs/workbench/contrib/search/browser/searchWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts
@@ -47,5 +47,3 @@ import { IDisposable, MutableDisposable } from '../../../../base/common/lifecycl
@@ -3864,7 +3852,7 @@ index e9c0fcd..f3e23de 100644
+ this.replaceInput.width = width - FONT.sidebarSize28;
this.replaceInput.inputBox.layout();
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index 21118dd..b5e53a1 100644
index 21118dd7..b5e53a1d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -58,2 +58,3 @@ import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
@@ -3891,20 +3879,20 @@ index 21118dd..b5e53a1 100644
+ inputBox.element.style.height = `${FONT.bottomPaneSize22}px`;
inputBox.value = value;
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
index e19fc27..56e4bbc 100644
index 02fdfa31..3bed1bbb 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
@@ -16,2 +16,3 @@ import { memoize } from '../../../../base/common/decorators.js';
import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
+import { FONT } from '../../../../base/common/font.js';
import { Iterable } from '../../../../base/common/iterator.js';
@@ -429,3 +430,3 @@ class TestCoverageTreeListDelegate implements IListVirtualDelegate<CoverageTreeE
@@ -440,3 +441,3 @@ class TestCoverageTreeListDelegate implements IListVirtualDelegate<CoverageTreeE
getHeight(element: CoverageTreeElement): number {
- return 22;
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
index 631bd2a..902bb81 100644
index 631bd2a2..902bb810 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
@@ -34,3 +34,2 @@ import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../../common/theme.
@@ -3921,20 +3909,20 @@ index 631bd2a..902bb81 100644
+ let delta = Math.max(0, evt.scrollTop - (this.hasMultipleFrames ? FONT.sidebarSize24 : 0));
delta = Math.min(Math.max(0, this.contentHeight - this.viewHeight), delta);
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index 9257aa6..3819205 100644
index 20d4dbdb..b48d2e90 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -85,2 +85,3 @@ import { DebugLastRun, ReRunLastRun } from './testExplorerActions.js';
import { TestingExplorerFilter } from './testingExplorerFilter.js';
+import { FONT } from '../../../../base/common/font.js';
@@ -1427,3 +1428,3 @@ class ListDelegate implements IListVirtualDelegate<TestExplorerTreeElement> {
@@ -1431,3 +1432,3 @@ class ListDelegate implements IListVirtualDelegate<TestExplorerTreeElement> {
getHeight(element: TestExplorerTreeElement) {
- return element instanceof TestTreeErrorMessage ? 17 + 10 : 22;
+ return element instanceof TestTreeErrorMessage ? FONT.sidebarSize17 + 10 : FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index c7c9cc7..84510c2 100644
index 7219c099..7c6bc96c 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -59,4 +59,3 @@ import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hove
@@ -3948,13 +3936,13 @@ index c7c9cc7..84510c2 100644
- pageSize = Math.max(20, Math.floor((this.tree?.renderHeight ?? 0 / ItemHeight) + (this.pageOnScroll ? 1 : -1)));
+ pageSize = Math.max(20, Math.floor((this.tree?.renderHeight ?? 0 / FONT.sidebarSize22) + (this.pageOnScroll ? 1 : -1)));
}
@@ -1147,3 +1146,3 @@ export class TimelineListVirtualDelegate implements IListVirtualDelegate<TreeEle
@@ -1148,3 +1147,3 @@ export class TimelineListVirtualDelegate implements IListVirtualDelegate<TreeEle
getHeight(_element: TreeElement): number {
- return ItemHeight;
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
index 27c6580..0feb646 100644
index 27c65807..0feb6465 100644
--- a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
@@ -17,2 +17,3 @@ import { localize } from '../../../../nls.js';
@@ -3967,7 +3955,7 @@ index 27c6580..0feb646 100644
+ return FONT.sidebarSize22;
}
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
index 9e6ca13..478e4e7 100644
index 0e3e5ccd..c7d20959 100644
--- a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
@@ -49,3 +49,2 @@ import { AgentSessionsControl, IAgentSessionsControlOptions } from '../../chat/b
@@ -3978,12 +3966,12 @@ index 9e6ca13..478e4e7 100644
import { ILogService } from '../../../../platform/log/common/log.js';
+import { FONT } from '../../../../base/common/font.js';
@@ -826,3 +826,3 @@ export class AgentSessionsWelcomePage extends EditorPane {
@@ -830,3 +830,3 @@ export class AgentSessionsWelcomePage extends EditorPane {
);
- const sessionsHeight = visibleSessions * AgentSessionsListDelegate.ITEM_HEIGHT;
+ const sessionsHeight = visibleSessions * FONT.sidebarSize22;
this.sessionsControl.layout(sessionsHeight, sessionsWidth);
@@ -831,3 +831,3 @@ export class AgentSessionsWelcomePage extends EditorPane {
@@ -835,3 +835,3 @@ export class AgentSessionsWelcomePage extends EditorPane {
// Visual height = ceil(n/2) * ITEM_HEIGHT, so offset = floor(n/2) * ITEM_HEIGHT
- const marginOffset = Math.floor(visibleSessions / 2) * AgentSessionsListDelegate.ITEM_HEIGHT;
+ const marginOffset = Math.floor(visibleSessions / 2) * FONT.sidebarSize22;