Skip to content
This repository has been archived by the owner on Jul 16, 2023. It is now read-only.

Commit

Permalink
Merge branch 'iocave:master' into fix-multiple-ui-fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
qyurila authored Oct 7, 2022
2 parents fd191fa + 91a9765 commit 3b973c2
Show file tree
Hide file tree
Showing 7 changed files with 927 additions and 1,269 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how

## [Unreleased]

## [0.1.65] - 2022-09-25

- Fix compatibility with VSCode 1.71.2

## [0.1.64] - 2022-09-14

- Fix compatibility with latest insiders

## [0.1.63] - 2022-08-05

- Remove node moduels from extension

## [0.1.62] - 2022-08-05

- Fix compability with latest vscode
Expand Down
1,089 changes: 217 additions & 872 deletions modules/activity-bar.js

Large diffs are not rendered by default.

42 changes: 0 additions & 42 deletions modules/fonts.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,6 @@ define([
return res;
});

// outline
require(["vs/editor/contrib/documentSymbols/outlineTree"], function(outlineTree) {
outlineTree.OutlineVirtualDelegate.prototype.getHeight = function () {
return rowHeight;
};
}, function(error) {});

// newer version
require(["vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree"], function(symbolsTree) {
symbolsTree.DocumentSymbolVirtualDelegate.prototype.getHeight = function () {
Expand All @@ -148,10 +141,6 @@ define([
return res;
};

require(["vs/workbench/browser/parts/views/customView"], function(customView) {
override(customView.CustomTreeView, "createTree", replacement);
}, function(error) {});

require(["vs/workbench/browser/parts/views/treeView"], function(treeView) {
if (treeView.TreeView)
override(treeView.TreeView, "createTree", replacement);
Expand Down Expand Up @@ -210,16 +199,6 @@ define([
return res;
}

require(["vs/workbench/contrib/scm/browser/scmViewlet"], function(scm) {
if (scm.MainPanel) {
override(scm.MainPanel, "renderBody", replacement);
}

if (scm.RepositoryPanel) {
override(scm.RepositoryPanel, "renderBody", replacement);
}
}, function(error) {});

replacement = function (original) {
let res = original();
if (this.tree && this.element) {
Expand Down Expand Up @@ -247,31 +226,10 @@ define([
return res;
}

require(["vs/workbench/contrib/scm/browser/mainPanel"], function(mp) {
override(mp.MainPanel, "renderBody", replacement);
}, function(error) {});

require(["vs/workbench/contrib/scm/browser/mainPane"], function(mp) {
override(mp.MainPane, "renderBody", replacement);
}, function(error) {});

require(["vs/workbench/contrib/scm/browser/repositoryPanel"], function(rp) {
override(rp.RepositoryPanel, "renderBody", replacement);
}, function(error) {});

require(["vs/workbench/contrib/scm/browser/repositoryPane"], function(rp) {
override(rp.RepositoryPane, "renderBody", replacement);
}, function(error) {});

require(["vs/workbench/contrib/timeline/browser/timelinePane"], function(tp) {
override(tp.TimelinePane, "renderBody", replacement);
}, function(error) {});

// panel height (OUTLINE, DEPENDENCIES, ...)
require(["vs/base/browser/ui/splitview/panelview"], function(panelView) {
panelView.Panel.HEADER_SIZE = rowHeight;
}, function(error) {});

// Version: 1.41.0-insider
require(["vs/base/browser/ui/splitview/paneview"], function(paneView) {
paneView.Pane.HEADER_SIZE = rowHeight;
Expand Down
Loading

0 comments on commit 3b973c2

Please sign in to comment.