Merge pull request #61 from lehni/feature/item-margin

Add activityBar.itemMargin configuration
drcika · Aug 10, 2023 · 9e880a1 · 9e880a1
2 parents bba8781 + fa76ea6
commit 9e880a1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/modules/configuration.js b/modules/configuration.js
@@ -111,7 +111,7 @@ define(['exports', 'apc/auxiliary'], function (exports, auxiliary) {
 
  ACTIVITY_BAR_SIZE: 48,
  get activityBar() {
- const { size, itemSize, position, hideSettings } = this.getConfiguration('apc.activityBar') || {};
+ const { size, itemSize, itemMargin, position, hideSettings } = this.getConfiguration('apc.activityBar') || {};
  const isHorizontal = !!position;
  return {
  position,
@@ -120,6 +120,7 @@ define(['exports', 'apc/auxiliary'], function (exports, auxiliary) {
  orientation: isHorizontal ? store.ActionsOrientation.HORIZONTAL : store.ActionsOrientation.VERTICAL,
  size: (size ?? this.ACTIVITY_BAR_SIZE) * this.zoomFactor,
  itemSize: (itemSize ?? size ?? this.ACTIVITY_BAR_SIZE) * this.zoomFactor,
+ itemMargin: (itemMargin ?? 3) * this.zoomFactor,
  isEnabled: !!size
  };
  },

diff --git a/modules/layout.activitybar.js b/modules/layout.activitybar.js
@@ -32,7 +32,7 @@ define(
  const options = store.activityBarCompositeBar.activityBarOptions;
  const size = config.activityBar.itemSize;
  options.overflowActionSize = size;
- options.compositeSize = size + 3; // 3 margine
+ options.compositeSize = size + config.activityBar.itemMargin;
  store.activityBarCompositeBar.recomputeSizes();
 
  store.activitybarPartView.layout();

diff --git a/modules/main.css b/modules/main.css
@@ -135,11 +135,11 @@ div.monaco-workbench {
 }
 
 .custom-activitybar:not(.horizontal-activitybar) div.monaco-workbench div.activitybar>div.content div.monaco-action-bar ul.actions-container li.action-item {
- margin-top: 3px;
+ margin-top: var(--activity-bar-action-item-margin);
 }
 
 .horizontal-activitybar div.monaco-workbench div.activitybar>div.content div.monaco-action-bar ul.actions-container li.action-item {
- margin-left: 3px;
+ margin-left: var(--activity-bar-action-item-margin);
 }
 
 .inline-title-bar:not(.horizontal-activitybar) .monaco-workbench:not(.fullscreen) .activitybar:not(.right) .content {

diff --git a/modules/ui.js b/modules/ui.js
@@ -85,6 +85,7 @@ define(['exports', 'apc/auxiliary', 'apc/configuration'], (exports, auxiliary, c
  --titlebar-font-size: ${sidebarTitlebarConfig.fontSize}px;
  --activity-bar-action-size: ${activityBarConfig.size}px;
  --activity-bar-action-item-size: ${activityBarConfig.itemSize}px;
+ --activity-bar-action-item-margin: ${activityBarConfig.itemMargin}px;
  --status-bar-font-size: ${statusBarConfig.fontSize}px;
  --traffic-X: ${trafficLightPosition.x}px;
  --custom-font-family: '${customFontFamily}';

diff --git a/package.json b/package.json
@@ -160,6 +160,10 @@
  "type": "number",
  "description": "Works only if apc.activityBar.size is specified, default apc.activityBar.size"
  },
+ "itemMargin": {
+ "type": "number",
+ "default": 3
+ },
  "position": {
  "type": "string",
  "enum": [