Skip to content

Actual infinity fixes for selection tool #180

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

Open
patrickas wants to merge 4 commits into
base: actual-infinity
Choose a base branch
from
Open

Actual infinity fixes for selection tool #180

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
7abb323
Only call recalculateBg when things actually change
patrickas Jan 21, 2023
a161b36
Selecting outside the canvas expands it
patrickas Jan 21, 2023
9dd27ac
When stamp tool is selected and we have an image selected, moving the…
patrickas Jan 21, 2023
cc53647
We expand when stamping not when moving the cursor. The current area …
patrickas Jan 22, 2023
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
1 change: 1 addition & 0 deletions js/lib/layers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ const layers = {

if (JSON.stringify(expand_by) !== JSON.stringify([0, 0, 0, 0])) {
this.expand(...expand_by);
recalculateBg();
}
},

Expand Down
1 change: 0 additions & 1 deletion js/ui/tool/dream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,6 @@ const dreamTool = () =>

if (global.connection === "online") {
imageCollection.auto_expand_to_fit(bb);
recalculateBg();
dream_generate_callback(bb, resolution, state);
} else {
const stop = march(bb, {
Expand Down
1 change: 1 addition & 0 deletions js/ui/tool/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ const selectTransformTool = () =>
selection.dragendcb(evn);

const bb = selection.bb;
imageCollection.auto_expand_to_fit(bb);

state.reset();

Expand Down
4 changes: 4 additions & 0 deletions js/ui/tool/stamp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,10 @@ const stampTool = () =>
const resource = state.selected;

if (resource) {
const real_bb = getBoundingBox(sx,sy,1,1); //TODO:Here we have to get the actual real bounding box somehow
imageCollection.auto_expand_to_fit(real_bb);
state.redraw();

const {canvas, bb} = cropCanvas(ovCanvas, {border: 10});
commands.runCommand("drawImage", "Image Stamp", {
image: canvas,
Expand Down