Skip to content

109 update shape widget to use line styling #111

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

Merged
merged 3 commits into from
May 2, 2025
Merged

109 update shape widget to use line styling #111

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56e05c0
Added lineStyle to shape widget
NatLeung96 Apr 30, 2025
5987410
Removed Border import
NatLeung96 Apr 30, 2025
481cd4c
Set boxSizing to border-box to match Phoebus behaviour
NatLeung96 May 1, 2025
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
25 changes: 21 additions & 4 deletions src/ui/widgets/Shape/shape.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
StringOrNumPropOpt,
MacrosPropOpt
} from "../propTypes";
import { Border, Color } from "../../../types";
import { Color } from "../../../types";
import { WIDGET_DEFAULT_SIZES } from "../EmbeddedDisplay/bobParser";

const ShapeProps = {
Expand All @@ -27,6 +27,7 @@ const ShapeProps = {
backgroundColor: ColorPropOpt,
lineColor: ColorPropOpt,
lineWidth: IntPropOpt,
lineStyle: IntPropOpt,
visible: BoolPropOpt
};

Expand All @@ -45,19 +46,35 @@ export const ShapeComponent = (
const cornerRadius = `${props.cornerWidth || 0}px / ${
props.cornerHeight || 0
}px`;
const borderCss = new Border(1, lineColor, lineWidth).css();
borderCss.borderRadius = cornerRadius;

// Use line properties to set border, unless alarm border
const style: CSSProperties = {
...borderCss,
borderColor: lineColor.toString(),
borderWidth: lineWidth,
borderRadius: cornerRadius,
width: width,
height: height,
boxSizing: "border-box",
backgroundColor: props.transparent
? "transparent"
: backgroundColor.toString(),
transform: props.shapeTransform ?? "",
visibility: visible ? undefined : "hidden"
};

style.borderStyle = (function () {
switch (props.lineStyle) {
case 1: // Dashed
case 3: // Dash-Dot
return "dashed";
case 2: // Dot
case 4: // Dash-Dot-Dot
return "dotted";
default:
return "solid";
}
})();

return <div style={style} />;
};

Expand Down
Loading