Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sketchbook tree indentation #1097

Merged
merged 1 commit into from
Jun 22, 2022
+29 −4
Merged

Sketchbook tree indentation #1097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 29 additions & 4 deletions arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-tree-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import * as React from '@theia/core/shared/react';
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
import {
inject,
injectable,
postConstruct,
} from '@theia/core/shared/inversify';
import { TreeNode } from '@theia/core/lib/browser/tree/tree';
import { CommandRegistry } from '@theia/core/lib/common/command';
import {
Expand All @@ -22,6 +26,11 @@ import { SelectableTreeNode } from '@theia/core/lib/browser/tree/tree-selection'
import { Sketch } from '../../contributions/contribution';
import { nls } from '@theia/core/lib/common';

const customTreeProps: TreeProps = {
leftPadding: 20,
kittaakos marked this conversation as resolved.
Show resolved Hide resolved
expansionTogglePadding: 6,
};

@injectable()
export class SketchbookTreeWidget extends FileTreeWidget {
@inject(CommandRegistry)
Expand Down Expand Up @@ -57,10 +66,14 @@ export class SketchbookTreeWidget extends FileTreeWidget {
super.init();
// cache the current open sketch uri
const currentSketch = await this.sketchServiceClient.currentSketch();
this.currentSketchUri = (CurrentSketch.isValid(currentSketch) && currentSketch.uri) || '';
this.currentSketchUri =
(CurrentSketch.isValid(currentSketch) && currentSketch.uri) || '';
}

protected override createNodeClassNames(node: TreeNode, props: NodeProps): string[] {
protected override createNodeClassNames(
node: TreeNode,
props: NodeProps
): string[] {
const classNames = super.createNodeClassNames(node, props);

if (
Expand All @@ -73,7 +86,10 @@ export class SketchbookTreeWidget extends FileTreeWidget {
return classNames;
}

protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
protected override renderIcon(
node: TreeNode,
props: NodeProps
): React.ReactNode {
if (SketchbookTree.SketchDirNode.is(node) || Sketch.isSketchFile(node.id)) {
return <div className="sketch-folder-icon file-icon"></div>;
}
Expand Down Expand Up @@ -199,4 +215,13 @@ export class SketchbookTreeWidget extends FileTreeWidget {
}
event.stopPropagation();
}

protected override getPaddingLeft(node: TreeNode, props: NodeProps): number {
return (
props.depth * customTreeProps.leftPadding +
(this.needsExpansionTogglePadding(node)
? customTreeProps.expansionTogglePadding
: 0)
);
}
}