Commit graph

151 commits

Author SHA1 Message Date
Victor Seiji Hariki
7dfd35839b generally fix black when outpainting using addons
For some reason, when using some extensions, firefox just bugs out the
context after running a toDataURL. We now create a separate canvas for
mask drawing.
2023-01-02 23:31:25 -03:00
tim h
0181091ceb Merge branch 'pr/140' into main
# Conflicts:
#	index.html
#	js/ui/tool/dream.js
2023-01-01 22:48:24 -06:00
tim h
25eb6258cf remove extra <br> 2023-01-01 22:06:09 -06:00
ribawaja
a0a5b57c12 add eager generate feature 2023-01-01 20:40:43 -05:00
tim h
5fbf9c37f2 marginally less ugly inpaint mode selector
really don't think it has any need to be a full-on autocomplete fancy thingy
2023-01-01 10:31:49 -06:00
tim h
370994a5d2 extremely ugly WIP implementation of img2img inpaint fill modes 2022-12-31 13:31:31 -06:00
tim h
aee0c33c7b significantly more useful hrfix updates
adds lock-to-max-hrfix-px slider which works pretty well if i do say so myself
2022-12-30 23:40:45 -06:00
tim h
c9a768d406 fixes hrfix x/y calcs on non-square reticles 2022-12-30 22:29:01 -06:00
Victor Seiji Hariki
c4d52fdfad now only considers staged files
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-30 07:44:10 -03:00
Victor Seiji Hariki
6d31640ae5 now only adds html files
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-30 07:27:26 -03:00
Victor Seiji Hariki
a95906dc8a sync should now work a bit better; #116
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-29 02:39:32 -03:00
Victor Seiji Hariki
84ba327706 allow pan via LMB drag
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-27 17:49:46 -03:00
Victor Seiji Hariki
12e371a481 Unused variable cleanup and new overmask px default
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-27 17:49:40 -03:00
tim h
8fbc42744e
Merge pull request #123 from zero01101/testing
An easy fix for mouse wheel scrolling
2022-12-26 16:49:56 -06:00
Victor Seiji Hariki
100829298c fixes #124
System clipboard paste was not working correctly

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-26 10:35:33 -03:00
Victor Seiji Hariki
3d298473b7 An easy fix for mouse wheel scrolling
Relates to #116

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-25 23:29:03 -03:00
Victor Seiji Hariki
14aed51a89 debugging button to help get information
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-24 11:56:30 -03:00
seijihariki
953aed236e Prettified Code! 2022-12-24 01:19:11 +00:00
Victor Seiji Hariki
92ab54282d fix addselection starting selection
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-23 22:18:37 -03:00
seijihariki
cfca5d95ba Prettified Code! 2022-12-24 00:48:55 +00:00
Victor Seiji Hariki
7a52508a3b Fixes #117
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-23 21:48:25 -03:00
tim h
01dbafb17f Merge branch 'main' into clear_brush_mask_option 2022-12-21 19:36:06 -06:00
tim h
1f407c4187 Merge branch 'main' into clear_brush_mask_option 2022-12-21 18:12:18 -06:00
Victor Seiji Hariki
42967f0a9a make cursors less finicky
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-21 18:29:11 -03:00
Victor Seiji Hariki
518e60f44a fix select interaction with layers and wrong sampler
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-21 14:30:35 -03:00
Victor Seiji Hariki
35d5868854 make stamp redraw on zoom
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-20 23:43:29 -03:00
Victor Seiji Hariki
94de86a971 webui set prompt and stamp uictx cursor
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-20 23:26:52 -03:00
tim h
aec0b5a5a1 adds option to preserve brushed mask post-dream 2022-12-19 18:51:29 -06:00
tim h
7cf9e468d5 fixes synced resolution changing undesirably with some tools on scrollwheel 2022-12-18 20:35:48 -06:00
tim h
f0aaf51389 css/js resource changes for extension 2022-12-18 17:50:40 -06:00
tim h
072e81ce5e Merge branch 'main' into testing 2022-12-17 15:07:26 -06:00
tim h
79ee0655b1 fixes resolution changing while scrolling through returned images if sync cursor size is enabled 2022-12-17 15:07:10 -06:00
tim h
b50b6f0ce4 come back progress bar, i miss you 2022-12-17 09:35:26 -06:00
Victor Seiji Hariki
9a8b064ab2 no need for this anymore
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:15:27 -03:00
Victor Seiji Hariki
2ee01e71c9 fix some tools
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:55:53 -03:00
Victor Seiji Hariki
ea68e25cf0 canvas scaling?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:21:28 -03:00
tim h
6d9155261e RFC- rename keepMask to keepUnmask
simple search/replace for keepMask[ed]
2022-12-16 19:59:30 -06:00
Victor Seiji Hariki
34ef37869f fix img2img mask canvas weirdness
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-16 01:28:03 -03:00
tim h
b30f7f23a9 brings back interrogate reticle 2022-12-15 21:15:50 -06:00
Victor Seiji Hariki
5872f2c3a4 fix duplicate mousewheel events
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 22:37:21 -03:00
tim h
065b3062a6 whoops 2022-12-15 09:51:08 -06:00
tim h
a7e02cd76d fixes use seed button for multiple dream queues 2022-12-15 09:25:20 -06:00
Victor Seiji Hariki
3207e86566 makes ctrl + middle be move canvas
This is for consistency with zoom and to avoid conflict with middle
mouse click for extra image generation

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 11:59:01 -03:00
Victor Seiji Hariki
c6a6342a8c This should be a bit better
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 11:51:18 -03:00
Victor Seiji Hariki
9a81946eef now selection dream compatible with mouse functions
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 09:57:41 -03:00
Victor Seiji Hariki
ec05084d71 ignore wheel on ctrl key and remove debug
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 15:45:41 -03:00
Victor Seiji Hariki
5e6b18503b Should mostly solve #94
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 15:12:44 -03:00
Victor Seiji Hariki
0c5ed4a17e select handle scaling
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 14:02:36 -03:00
Victor Seiji Hariki
6cdd9495e3 keep masked option added
a fix for #99

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 00:17:17 -03:00
tim h
59b2d451fe whoops jr 2022-12-13 20:08:46 -06:00