Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/vs/sessions/browser/media/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@
background: rgba(0, 0, 0, 0.5);
}

.agent-sessions-workbench .monaco-modal-editor-block .modal-editor-sidebar .monaco-tl-twistie.force-no-twistie {
width: 0 !important;
padding-left: 0 !important;
padding-right: 0 !important;
}


/* ---- Customization Empty State ---- */

Expand Down
17 changes: 14 additions & 3 deletions src/vs/sessions/contrib/changes/browser/changesView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
import { Event } from '../../../../base/common/event.js';
import { autorun, derived, derivedOpts, IObservable } from '../../../../base/common/observable.js';
import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
import { basename, isEqual } from '../../../../base/common/resources.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
Expand All @@ -39,7 +40,7 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
import { IStorageService } from '../../../../platform/storage/common/storage.js';
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
import { defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
import { defaultCountBadgeStyles, defaultProgressBarStyles } from '../../../../platform/theme/browser/defaultStyles.js';
import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
import { fillEditorsDragData } from '../../../../workbench/browser/dnd.js';
import { ResourceLabels } from '../../../../workbench/browser/labels.js';
Expand Down Expand Up @@ -812,6 +813,13 @@ export class ChangesViewPane extends ViewPane {
const viewMode = this.viewModel.viewModeObs.get();
container.classList.toggle('list-mode', viewMode === ChangesViewMode.List);

// "Changes" header
const headerNode = dom.append(container, $('.changes-sidebar-header'));
const headerLabel = dom.append(headerNode, $('span'));
headerLabel.textContent = localize('changes', "Changes");
const countBadge = disposables.add(new CountBadge(headerNode, { count: items.length }, defaultCountBadgeStyles));
countBadge.setCount(items.length);

const tree = this.createChangesTree(container, Event.None, disposables, () => tree.getSelection().filter(item => !!item && isChangesFileItem(item)));

if (viewMode === ChangesViewMode.Tree) {
Expand Down Expand Up @@ -855,8 +863,11 @@ export class ChangesViewPane extends ViewPane {
}
}));

// Layout on resize
disposables.add(onDidLayout(e => tree.layout(e.height, e.width)));
// Layout on resize, accounting for the header height
disposables.add(onDidLayout(e => {
const headerHeight = headerNode.offsetHeight;
tree.layout(Math.max(0, e.height - headerHeight), e.width);
}));

return disposables;
}
Expand Down
12 changes: 12 additions & 0 deletions src/vs/sessions/contrib/changes/browser/media/changesView.css
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,18 @@
padding-left: 0 !important;
}

/* Modal sidebar "Changes" header */
.changes-file-list .changes-sidebar-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 6px;
padding: 2px 0;
min-height: 22px;
font-weight: 500;
font-size: 12px;
}

/* List rows */
.changes-view-body .chat-editing-session-container:not(.has-file-icons) .monaco-list-row .monaco-icon-label {
margin-left: 6px;
Expand Down
Loading