Skip to content
Closed
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: 3 additions & 3 deletions apps/web/src/components/LayerlingEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { GuideHelpLink } from "@/components/GuideHelpLink";
import { ShapeMenuPanel } from "@/components/workplane/ShapeMenuPanel";
import { AlertTriangle, ArrowDownToLine, ArrowUpFromLine, Blend, Check, CircleHelp, Percent, Circle as CircleIcon, CloudUpload, Download, Eye, EyeOff, FilePlus2, FolderOpen, Hexagon as HexagonIcon, Info, ListTree, Pencil, Pentagon as PentagonIcon, Rotate3d, Route as RouteIcon, Search, Square as SquareIcon, Star as StarIcon, Triangle as TriangleIcon, X } from "lucide-react";
import { AlertTriangle, ArrowDownToLine, ArrowUpFromLine, Check, CircleHelp, Percent, Circle as CircleIcon, CloudUpload, Download, Eye, EyeOff, FilePlus2, FolderOpen, Hexagon as HexagonIcon, Info, ListTree, Pencil, Pentagon as PentagonIcon, Rotate3d, Route as RouteIcon, Search, Square as SquareIcon, Star as StarIcon, Triangle as TriangleIcon, X } from "lucide-react";
import { ObjectListPanel } from "@/components/workplane/ObjectListPanel";
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type CSSProperties } from "react";
import { useWheelField } from "@/lib/useWheelField";
Expand Down Expand Up @@ -71,7 +71,7 @@ import {
ToolbarHideSelectedIcon,
ToolbarHomeIcon,
ToolbarImportIcon,
ToolbarIntersectionIcon,
ToolbarIntersectionIcon, ToolbarIntersectPreviewIcon,
ToolbarKeyboardIcon,
ToolbarFilletIcon,
ToolbarHistoryIcon,
Expand Down Expand Up @@ -13812,7 +13812,7 @@ function SecondaryToolbar({
{ id: "bundle", label: t("editor.tool.bundle"), icon: ToolbarBundleIcon, action: onBundle, enabled: canGroup },
{ id: "ungroup", label: t("editor.tool.ungroup"), icon: ToolbarUngroupIcon, action: onUngroup, enabled: canUngroup },
{ id: "intersect", label: t("editor.tool.intersect"), icon: ToolbarIntersectionIcon, action: onIntersect, enabled: canIntersect || intersectPreviewActive },
{ id: "intersect-preview", label: t("editor.tool.intersectPreview"), icon: Blend, action: onIntersectPreview, enabled: canIntersect || intersectPreviewActive, active: intersectPreviewActive },
{ id: "intersect-preview", label: t("editor.tool.intersectPreview"), icon: ToolbarIntersectPreviewIcon, action: onIntersectPreview, enabled: canIntersect || intersectPreviewActive, active: intersectPreviewActive },
];
const modifyTools = [
{ id: "mirror", label: t("editor.tool.mirror"), icon: ToolbarMirrorIcon, action: onMirror, enabled: canModifySelection, active: mirrorMode },
Expand Down
9 changes: 8 additions & 1 deletion apps/web/src/components/icons.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Blend } from "lucide-react";
import type { CSSProperties, SVGProps } from "react";

type IconProps = SVGProps<SVGSVGElement>;
Expand Down Expand Up @@ -83,14 +84,20 @@ export function ToolbarCaretDownIcon(props: IconProps) {

export function ToolbarIntersectionIcon(props: IconProps) {
return (
<svg viewBox="0 0 48 48" aria-hidden="true" {...props}>
<svg viewBox="0 0 48 48" aria-hidden="true" className="toolbar-vector-art-icon" {...props}>
<circle cx="19" cy="24" r="13" fill="none" stroke="currentColor" strokeWidth="2.4" />
<circle cx="29" cy="24" r="13" fill="none" stroke="currentColor" strokeWidth="2.4" strokeDasharray="4 3" />
<path d="M24 11.99A13 13 0 0 1 24 36.01A13 13 0 0 1 24 11.99Z" fill="currentColor" opacity="0.82" />
</svg>
);
}

// The class gives it the same disabled dimming as the rest of the ribbon; the
// bare theme colour alone left it looking live on the dark grounds.
export function ToolbarIntersectPreviewIcon({ className, ...props }: IconProps) {
return <Blend className={["toolbar-vector-art-icon", className].filter(Boolean).join(" ")} {...props} />;
}

export function ToolbarAlignIcon(props: IconProps) {
return <ToolbarSpriteIcon rect={{ x: 97.3, y: 46.7, width: 29.1, height: 32.5 }} {...props} />;
}
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ code still carries it - so a lower number further down is older, not newer.

## Unreleased

- **Boolean Intersection and Show common part grey out on the dark grounds:** With fewer than two parts selected the two buttons were disabled but looked live in the dark and graphite themes.

## 1.99.0

- **Rounded box radii to 0.01 mm (#705):** `normalizeCornerFillet` and `normalizeTopBottomFillet` rounded to a tenth of a millimetre, so a corner fillet of 0.25 mm came back as 0.3 mm. They round to a hundredth now, and the fields (the shape's properties and the defaults in the workspace settings) step by 0.05. The CAD solid reads the same functions, so it follows. Unit test in `roundedBoxGeometry.test.ts` (0.25 stays 0.25, 7.336 becomes 7.34). Reported by @Algotz on GitHub.
Expand Down
Loading