microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-05 20:08:58 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

SCM Graph - fix edge case for commit margin (#248821)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-05-13 14:39:49 +00:00
committed by GitHub
parent b8280a759b
commit 0f39b4f2cd
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/workbench/contrib/scm/browser/scmHistory.ts
View File

@@ -353,3 +353,19 @@ export function toISCMHistoryItemViewModelArray(
return viewModels;
}
export function getHistoryItemColor(historyItemViewModel: ISCMHistoryItemViewModel): string {
const historyItem = historyItemViewModel.historyItem;
const inputSwimlanes = historyItemViewModel.inputSwimlanes;
const outputSwimlanes = historyItemViewModel.outputSwimlanes;
// Find the history item in the input swimlanes
const inputIndex = inputSwimlanes.findIndex(node => node.id === historyItem.id);
// Circle index - use the input swimlane index if present, otherwise add it to the end
const circleIndex = inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
// Circle color - use the output swimlane color if present, otherwise the input swimlane color
return circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color :
circleIndex < inputSwimlanes.length ? inputSwimlanes[circleIndex].color : historyItemRefColor;
}

8
src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
View File

@@ -31,7 +31,7 @@ import { asCssVariable, ColorIdentifier, foreground } from '../../../../platform
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
import { IViewPaneOptions, ViewAction, ViewPane, ViewPaneShowActions } from '../../../browser/parts/views/viewPane.js';
import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
import { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, historyItemHoverDeletionsForeground, historyItemHoverLabelForeground, historyItemHoverAdditionsForeground, historyItemHoverDefaultLabelForeground, historyItemHoverDefaultLabelBackground, historyItemRefColor } from './scmHistory.js';
import { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, historyItemHoverDeletionsForeground, historyItemHoverLabelForeground, historyItemHoverAdditionsForeground, historyItemHoverDefaultLabelForeground, historyItemHoverDefaultLabelBackground, getHistoryItemColor } from './scmHistory.js';
import { getHistoryItemEditorTitle, getProviderKey, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemLoadMoreTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMRepository } from './util.js';
import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemRef, ISCMHistoryItemViewModel, ISCMHistoryProvider, SCMHistoryItemChangeViewModelTreeElement, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemViewModelTreeElement } from '../common/history.js';
import { HISTORY_VIEW_PANE_ID, ISCMProvider, ISCMRepository, ISCMService, ISCMViewService } from '../common/scm.js';
@@ -414,8 +414,7 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeEl
});
templateData.elementDisposables.add(historyItemHover);
const color = historyItemViewModel.inputSwimlanes.find(s => s.id === historyItem.id)?.color;
templateData.margin.style.borderLeftColor = asCssVariable(color ?? historyItemRefColor);
templateData.margin.style.borderLeftColor = asCssVariable(getHistoryItemColor(historyItemViewModel));
templateData.graphContainer.textContent = '';
templateData.graphContainer.classList.toggle('current', historyItemViewModel.isCurrent);
@@ -672,8 +671,7 @@ class HistoryItemChangeRenderer implements ITreeRenderer<SCMHistoryItemChangeVie
const historyItemViewModel = element.element.historyItemViewModel;
const historyItemChange = element.element.historyItemChange;
const color = historyItemViewModel.inputSwimlanes.find(s => s.id === historyItemViewModel.historyItem.id)?.color;
templateData.margin.style.borderLeftColor = asCssVariable(color ?? historyItemRefColor);
templateData.margin.style.borderLeftColor = asCssVariable(getHistoryItemColor(historyItemViewModel));
templateData.graphPlaceholder.textContent = '';
templateData.graphPlaceholder.style.width = `${SWIMLANE_WIDTH * (element.element.graphColumns.length + 1)}px`;