Commit graph

226 commits

Author SHA1 Message Date
Victor Seiji Hariki
72ebe5ba21
some fixes and comments
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
(cherry picked from commit 6299b561f196a7c78c66a8d21b2e1b27cecdee77)
2022-11-25 19:23:22 -03:00
Victor Seiji Hariki
df5dc32eee Some quick lunch patches
Allows for selections and dreams to be sent to the resource manager,
allows resource deselection when clicking on the currently selected
item, put some extra comments and allow saving of a selected canvas area

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 963312115d4827de1c8d4fac88a97dd64db7fa15
2022-11-25 13:16:22 -03:00
Victor Seiji Hariki
db73982df2 some general fixes
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4434e218c4f67ac3c63c3a5b645013588a7ce770
2022-11-25 01:46:49 -03:00
Victor Seiji Hariki
8419f52f43 fix cancel action for select tool
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0bfa9a2cae4aa080571ae8eca576c94c023b6d44
2022-11-25 00:59:10 -03:00
Victor Seiji Hariki
97f3a54644 Make pasting lock the toolbar
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4b236153eb7b61af5d7ec8703069709aeea684a3
2022-11-25 00:55:16 -03:00
Victor Seiji Hariki
ded2e448bb focus on dream again
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: a07d53d6f1a2fa469da81054084ad67a174b21b6
2022-11-25 00:41:30 -03:00
Victor Seiji Hariki
70d1fda23d a big commit with the selection and stamping tools
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: b3f849f3fdb334916f1a4ee6c81ac6bdf42a8f52
2022-11-25 00:34:34 -03:00
Victor Seiji Hariki
42144ea577 allow shortcut deletion via callback
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0a46ffda9945ad95665634c21c9732e7d9d1497e
2022-11-24 12:30:13 -03:00
Victor Seiji Hariki
2fdcdc7f0c remove usebordermask box
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: f194ab10ed3caa63d3e8468de035b70d414244bf
2022-11-24 12:17:29 -03:00
Victor Seiji Hariki
65961ad0a9 Merge branch 'main' into img2img-fix
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 61d27f561539a40e64da7218f022f846ed9727d4
2022-11-24 12:08:35 -03:00
Victor Seiji Hariki
76938b535f img2img fix and better custom slider rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: eb961230a2eeb352dd6097c7010ed0775f1dd3ce
2022-11-24 11:54:30 -03:00
tim h
9417ba7902 fix issue 47
Former-commit-id: ac5e43439e0a1b56243c522c750ecd7b8e0323fc
2022-11-24 08:46:02 -06:00
tim h
9a21d4f786 tweak to overmask """formula""", updates it for fancy new slider
Former-commit-id: 9ecd7c40e154270e66eb36677f64656cc616cdb0
2022-11-24 00:02:04 -06:00
tim h
da95542c34 Merge pull request #43 from seijihariki/input-rework-2
non-broken version on input-rework

Former-commit-id: 44ae64a42f7bb11520e4e29180be4a67f2814b50
2022-11-23 23:54:07 -06:00
tim h
eb46b36afb moves overmask to txt2img/outpaint context menu
Former-commit-id: 0ee5c7946da0e037be950b3c3354e2cba87bdfca
2022-11-23 23:43:51 -06:00
Victor Seiji Hariki
951fbacd6c non-broken version on input-rework
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 3c337c8cf8d4a65cb2fe0845f6eaf9315eb21ae7
2022-11-24 01:53:14 -03:00
tim h
617d8ee25c the inglorious return of overmasking
Former-commit-id: 1a81a3f783d0bf78f530b9a72db090f9ed65d8ae
2022-11-23 17:40:10 -06:00
Victor Seiji Hariki
d7c42510ad well, that was painful
Seems history was actually working until I decided to put a pretty
"removing ###" message

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: a40f1d6e0d53e7186aa2d85832906280331f4aad
2022-11-23 19:06:59 -03:00
Victor Seiji Hariki
89b1323cd9 Merge branch 'main' into img2img
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4a07944ebfb71076a6dfb9a83e45a07a30874abd
2022-11-23 19:03:15 -03:00
Victor Seiji Hariki
8b20807c1b fix history do after undo
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: de84fcb501cd576e8546abc5b1d4e42933488252
2022-11-23 09:09:59 -03:00
Victor Seiji Hariki
5b2a6234d4 extended timing on progress check and fixed dream
Progress check now has a 1.5s timing window (we can update it to wait
for the last update before sending a new progress request in the future)

Fixed dream() call in img2img tool

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: c137f13e5a71f0b62cc7094bd53f8a4e5f89fcb6
2022-11-23 08:12:14 -03:00
Victor Seiji Hariki
c54a51f8ee Merge branch 'toolbar' into img2img
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: c8b0a3983dd07e64bc67d848814494be0ee8075d
2022-11-22 23:10:45 -03:00
Victor Seiji Hariki
35e5951c61 Merge branch 'main' into toolbar
Now skipping images, saving bandwidth

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 214f44c7ce6a1d9bf7598d45b6cef10e88e99cae
2022-11-22 23:06:37 -03:00
Victor Seiji Hariki
2eb6e6ff3e add img2img tool and refactor tool context menus
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 3a36d0e0d7004142ee8d1ecdec14bb905db4919f
2022-11-22 22:24:04 -03:00
Victor Seiji Hariki
250c833895 Added tool menu and migrated image generation ot new input
Also updates a lot of other things (brush size now independent from
scale factor, split some files, and a lot other things; removed erase
safeguard as now erase is supported by undo/redo; tried adding github
prettier autoformatting to pull requests;

may have some other things as well

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0ba21f23c69f9dca2c3189a838b945900b01f81d
2022-11-22 19:28:27 -03:00
Victor Seiji Hariki
87ea1be32d add history list view and interaction
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 7064b38c9663c0219424b4864243f16d4aa68a24
2022-11-22 02:16:17 -03:00