Commit Graph

265 Commits

Author SHA1 Message Date
blessedcoolant
f60d22b29b Fix an issue with the OutsideWatcher
The OutsideWatcher was disabling hotkeys because it was always being active -- whether the object was pinned or not. Modified the hook to now take a new optional argument called "req" which is a boolean that indicates whether to trigger it or not.

We can pass this from the component to control when the outside watcher should work and when it shouldn't.
2022-10-31 23:57:19 +11:00
blessedcoolant
6a6fbe24a3 Styling & Hotkeys Update 2022-10-31 23:57:19 +11:00
psychedelicious
5efd2ed7a8 Demotes inpainting to img2img when mask is empty 2022-10-31 23:56:49 +11:00
psychedelicious
62c346850c Improves styling 2022-10-31 23:56:49 +11:00
psychedelicious
f6fafe3eb3 Improves bounding box fit behaviour when changing inpaint image 2022-10-31 23:56:49 +11:00
psychedelicious
6547c320a9 Adds "loopback" feature 2022-10-31 23:56:49 +11:00
psychedelicious
2d32cf4eeb Styling improvements 2022-10-31 23:56:49 +11:00
psychedelicious
ac1469bbd3 Fixes: inpainting bug "images do not match" 2022-10-31 23:56:49 +11:00
psychedelicious
c0c32d9daa Fixes bug with bounding box transforming cursor 2022-10-31 23:56:49 +11:00
psychedelicious
52e74fef7c Fixes missing gallery category on generated images 2022-10-31 23:56:49 +11:00
psychedelicious
e431d296c0 Builds fresh bundle + tidy 2022-10-31 23:56:49 +11:00
psychedelicious
1e7a5fda24 Fixes #1295 2022-10-31 23:56:49 +11:00
psychedelicious
050d72478e Attempts to fix #1297 2022-10-31 23:56:49 +11:00
psychedelicious
d3a09f1284 Updates styles 2022-10-31 23:56:49 +11:00
psychedelicious
e096eef049 Fixes next/prev image not working if category doesn't match 2022-10-31 23:56:49 +11:00
psychedelicious
62c97dd7e6 Fixes edge cases, adds invoke button to header when options floating 2022-10-31 23:56:49 +11:00
psychedelicious
e58b7a7ef9 Adds pin feature to options panel 2022-10-31 23:56:49 +11:00
psychedelicious
e1cb5b8251 Fixes: inpaint canvas not cleared when its src image is deleted 2022-10-29 23:53:47 +11:00
psychedelicious
101fe9efa9 Adds full-app image drag and drop, also image paste 2022-10-29 23:34:21 +11:00
psychedelicious
2e9463089d Fixes bounding box being able to escape canvas 2022-10-29 23:32:16 +11:00
psychedelicious
0290cd6814 Fixes bounding box slider & adds canvas caching on gallery actions 2022-10-29 18:32:01 +11:00
psychedelicious
162e420e9c Adds socketio event for Ctrl+C cancel, style fixes 2022-10-29 16:57:05 +11:00
psychedelicious
a701e4f90b Fixes compilation error; builds new bundle 2022-10-29 16:32:21 +11:00
psychedelicious
f22f81b4ff Refactors gallery resizing, persists width 2022-10-29 16:30:51 +11:00
psychedelicious
9fc6ee0c4c WIP: Fixes gallery resize bug 2022-10-29 14:50:04 +11:00
psychedelicious
5d76c57ce2 Misc fixes 2022-10-29 14:18:07 +11:00
psychedelicious
2c250a515e Misc fixes 2022-10-29 14:17:38 +11:00
psychedelicious
4204740cb2 Fixes failed inpainting with float bounding box 2022-10-29 14:17:18 +11:00
psychedelicious
accb1779cb Fixes react dom warnings 2022-10-29 13:36:07 +11:00
psychedelicious
387f39407a Fixes bounding box hotkey conditions 2022-10-29 13:28:53 +11:00
psychedelicious
6a32adb7ed Fixes brush strokes not compositing correct on initial load 2022-10-29 13:12:34 +11:00
psychedelicious
9291fde960 Fixes responsive images (omg finally), removes app padding 2022-10-29 12:22:07 +11:00
psychedelicious
0b046c95ef Merge remote-tracking branch 'origin/user-image-uploads' into inpainting-rebase 2022-10-29 09:41:07 +11:00
blessedcoolant
861e825ebf Styling Updates 2022-10-29 09:27:44 +13:00
psychedelicious
2859af386c Fixes places where isCancelable could get stuck on 2022-10-29 04:44:03 +11:00
psychedelicious
8dee3387fd Merge branch 'user-image-uploads' into inpainting-rebase
Adds
- Separate user uploads gallery
- Drag and drop uploads for img2img and inpainting
- Many bugfixes, scss refactored
2022-10-29 04:40:38 +11:00
psychedelicious
63eeac49f8 Blacklists isCancelable 2022-10-29 04:25:27 +11:00
psychedelicious
d5fdee72d3 Builds fresh bundle 2022-10-29 04:25:27 +11:00
psychedelicious
765092eb12 Fixes bug with gallery not closing 2022-10-29 04:25:27 +11:00
psychedelicious
2c9747fd41 Fixes bug with infinite redux action loop 2022-10-29 04:25:27 +11:00
psychedelicious
62898b0f8f Adds gallery auto-switch toggle; ref #1272 2022-10-29 04:25:27 +11:00
psychedelicious
ac7ee9d0a5 Puts model switching into accordion, styling 2022-10-29 04:25:27 +11:00
psychedelicious
0adb7d4676 Adds error handling to & improves model switching UI 2022-10-29 04:25:27 +11:00
blessedcoolant
27a7980dad Update Site Header Icons Layout 2022-10-29 04:25:27 +11:00
psychedelicious
a5915ccd2c Adds initial model switching UI 2022-10-29 04:25:27 +11:00
psychedelicious
d6815f61ee Fixes build error 2022-10-29 04:25:27 +11:00
psychedelicious
d71f11f55c Fixes typo 2022-10-29 04:25:27 +11:00
psychedelicious
ed45dca7c1 Improves bounding box hotkeys/UX 2022-10-29 04:25:27 +11:00
psychedelicious
dd71066391 Fixes more bounding box bugs 2022-10-29 04:25:27 +11:00
psychedelicious
6f51b2078e Improves bounding box behavior 2022-10-29 04:25:27 +11:00
psychedelicious
d035e0e811 Fixes bounding box move ending when mouse leaves canvas 2022-10-29 04:25:27 +11:00
psychedelicious
55a8da0f02 Adds lock bounding box 2022-10-29 04:25:27 +11:00
psychedelicious
320cbdd62d Builds fresh bundle 2022-10-29 04:25:27 +11:00
blessedcoolant
f8dce07486 Add Space Hotkey to legend
Add space as hotkey for moving boundbox to the hotkeys modal legend.
2022-10-29 04:25:27 +11:00
blessedcoolant
37382042c1 Adding Bounding Box Reset Disables
Add disable conditions for reset buttons on bounding box width and height
2022-10-29 04:25:27 +11:00
blessedcoolant
2af8139029 Styling Updates
- Moved Inpaint Replace higher in the options panel
- Fixed inpaint replace switch getting cut off slightly by padding a bit.
2022-10-29 04:25:27 +11:00
blessedcoolant
a5c77ff926 Fully Updated Hotkeys + Categorization
Added the entire list of available hotkeys to the hotkey module and categorized them accordingly.
2022-10-29 04:25:27 +11:00
blessedcoolant
15df6c148a Fix galleryImageObjectFit now persisting 2022-10-29 04:25:27 +11:00
blessedcoolant
e6226b45de Change default of inpaintReplace to 1 2022-10-29 04:25:27 +11:00
psychedelicious
ab1e207765 Fixes gallery closing on context menu 2022-10-29 04:25:27 +11:00
psychedelicious
d2ed8883f7 Adds support for inpaint_replace 2022-10-29 04:25:27 +11:00
psychedelicious
3ddf1f6c3e Removes mask lines check 2022-10-29 04:25:27 +11:00
psychedelicious
5395707280 Adds Maintain Aspect Ratio checkbox to ImageGallery 2022-10-29 04:25:27 +11:00
blessedcoolant
710e465054 Add Inpainting Settings
- Enable and Disable Inpainting Box (with backend support)
- Enable and Disable Bounding Box Darkening
- Reset Bounding Box
2022-10-29 04:25:27 +11:00
psychedelicious
30bd79ffa1 Adds fn to checkIsMaskEmpty, tidy 2022-10-29 04:25:27 +11:00
psychedelicious
20c83d7568 Fixes bug with overflowing bounding box 2022-10-29 04:25:27 +11:00
psychedelicious
67e0e97eda Increases size of bounding box handles 2022-10-29 04:25:27 +11:00
psychedelicious
6bebc679c4 Fixes invoke button working when only eraser strokes 2022-10-29 04:25:26 +11:00
psychedelicious
9406b95518 Fixes missing border on brush 2022-10-29 04:25:26 +11:00
psychedelicious
8d8f93fd00 Fixes bug where bounding box could escape bounds of canvas 2022-10-29 04:25:26 +11:00
psychedelicious
20a3875f32 Fixes edge cases with bounding box 2022-10-29 04:25:26 +11:00
psychedelicious
8ab428e588 Adds bounding box handles 2022-10-29 04:25:26 +11:00
psychedelicious
e5dcae5fff Merges development 2022-10-29 04:25:26 +11:00
psychedelicious
329cd8a38b Adds inpainting image reset button 2022-10-29 04:13:15 +11:00
psychedelicious
0855ab4173 Adds user/result galleries, refactors workarea CSS 2022-10-29 03:54:46 +11:00
psychedelicious
3a7b495167 Initial user uploads implementation 2022-10-28 23:15:03 +11:00
psychedelicious
9d1594cbcc Builds fresh bundle 2022-10-28 21:10:23 +11:00
psychedelicious
c48a1092f7 Fixes bug with gallery not closing 2022-10-28 21:03:33 +11:00
psychedelicious
35dba1381c Fixes bug with infinite redux action loop 2022-10-28 20:50:10 +11:00
psychedelicious
631dce3aca Adds gallery auto-switch toggle; ref #1272 2022-10-28 20:22:01 +11:00
psychedelicious
ea6e998094 Puts model switching into accordion, styling 2022-10-28 20:04:57 +11:00
psychedelicious
d551de6e06 Adds error handling to & improves model switching UI 2022-10-28 18:51:50 +11:00
blessedcoolant
7ce1cf6f3e Update Site Header Icons Layout 2022-10-28 19:49:50 +13:00
psychedelicious
2e89997d29 Adds initial model switching UI 2022-10-28 16:47:15 +11:00
psychedelicious
a7e2a7037a Fixes build error 2022-10-28 15:44:04 +11:00
psychedelicious
75d8fc77c2 Fixes typo 2022-10-28 15:00:45 +11:00
psychedelicious
4ea954fd66 Improves bounding box hotkeys/UX 2022-10-28 14:53:07 +11:00
psychedelicious
a8a30065a4 Fixes more bounding box bugs 2022-10-28 14:14:28 +11:00
psychedelicious
27ba91e74d Improves bounding box behavior 2022-10-28 13:59:52 +11:00
psychedelicious
bbe53841e4 Fixes bounding box move ending when mouse leaves canvas 2022-10-28 11:50:39 +11:00
psychedelicious
042d3e866f Adds lock bounding box 2022-10-28 11:37:46 +11:00
psychedelicious
0ea711e520 Builds fresh bundle 2022-10-28 11:28:58 +11:00
blessedcoolant
ef5f9600e6 Add Space Hotkey to legend
Add space as hotkey for moving boundbox to the hotkeys modal legend.
2022-10-28 11:28:45 +11:00
blessedcoolant
acdffb1503 Adding Bounding Box Reset Disables
Add disable conditions for reset buttons on bounding box width and height
2022-10-28 11:28:39 +11:00
blessedcoolant
6679e5be69 Styling Updates
- Moved Inpaint Replace higher in the options panel
- Fixed inpaint replace switch getting cut off slightly by padding a bit.
2022-10-28 11:28:28 +11:00
blessedcoolant
89ad2e55d9 Fully Updated Hotkeys + Categorization
Added the entire list of available hotkeys to the hotkey module and categorized them accordingly.
2022-10-28 11:28:20 +11:00
blessedcoolant
f8dff5b6c2 Fix galleryImageObjectFit now persisting 2022-10-28 11:28:13 +11:00
blessedcoolant
104b0ef0ba Change default of inpaintReplace to 1 2022-10-28 11:28:03 +11:00
psychedelicious
07cdf6e9cb Fixes gallery closing on context menu 2022-10-28 11:27:41 +11:00
psychedelicious
4cf9c965d4 Adds support for inpaint_replace 2022-10-28 11:27:41 +11:00