Skip to content

chore: BROS-362: Disable smoothing automatically when Bitmask is used #8374

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
robot-ci-heartex merged 4 commits into from
Sep 15, 2025
Merged

chore: BROS-362: Disable smoothing automatically when Bitmask is used #8374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a59c64b
Disable smoothing automatically when Bitmask is used
nick-skriabin Sep 9, 2025
275967b
Merge branch 'develop' into fb-bros-362/smoothing
nick-skriabin Sep 9, 2025
1465568
Merge branch 'develop' into fb-bros-362/smoothing
nick-skriabin Sep 11, 2025
5136450
Merge branch 'develop' into fb-bros-362/smoothing
nick-skriabin Sep 14, 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
11 changes: 6 additions & 5 deletions web/libs/editor/src/components/ImageView/ImageView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const DrawingRegion = observer(({ item }) => {
const Wrapper = drawingRegion && isBrush ? Fragment : Layer;

return (
<Wrapper imageSmoothingEnabled={item.smoothing}>
<Wrapper imageSmoothingEnabled={item.smoothingEnabled}>
{drawingRegion ? <Region key={"drawing"} region={drawingRegion} /> : drawingRegion}
</Wrapper>
);
Expand Down Expand Up @@ -552,7 +552,8 @@ export default observer(
constructor(props) {
super(props);

if (typeof props.item.smoothing === "boolean") props.store.settings.setSmoothing(props.item.smoothing);
if (typeof props.item.smoothingEnabled === "boolean")
props.store.settings.setSmoothing(props.item.smoothingEnabled);
}

handleOnClick = (e) => {
Expand Down Expand Up @@ -1329,7 +1330,7 @@ const ImageLayer = observer(({ item }) => {
}, [loadedImage, brightness, contrast]);

return loadedImage ? (
<Layer imageSmoothingEnabled={item.smoothing} scale={{ x: item.stageZoom, y: item.stageZoom }}>
<Layer imageSmoothingEnabled={item.smoothingEnabled} scale={{ x: item.stageZoom, y: item.stageZoom }}>
<KonvaImage ref={konvaImageRef} image={loadedImage} width={width} height={height} listening={false} />
</Layer>
) : null;
Expand Down Expand Up @@ -1450,15 +1451,15 @@ const StageContent = observer(({ item, store, state, crosshairRef }) => {
regions={list}
useLayers={useLayers}
suggestion={isSuggestion}
smoothing={item.smoothing}
smoothing={item.smoothingEnabled}
/>
) : (
<Fragment key={groupName} />
);
})}
<Selection item={item} isPanning={state.isPanning} />
<DrawingRegion item={item} />
{item.smoothing === false && <PixelGridLayer item={item} />}
{item.smoothingEnabled === false && <PixelGridLayer item={item} />}

{item.crosshair && (
<Crosshair
Expand Down
11 changes: 11 additions & 0 deletions web/libs/editor/src/tags/object/Image/Image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,17 @@ const Model = types

return skipInteractions || isPanning;
},
get smoothingEnabled() {
const names = self.annotation?.names;

if (!names) return self.smoothing;

const hasBitmask = Array.from(names.values()).some(({ type }) => {
return type.includes("bitmask");
});
if (hasBitmask) return false;
return self.smoothing;
},
},
actions: {
setSkipInteractions(value) {
Expand Down
Loading