Merge pull request #166 from zero01101/image_remove_button

implements single-image delete from batch and "-" keyboard shortcut
This commit is contained in:
tim h 2023-01-10 17:03:58 -06:00 committed by GitHub
commit bf21c19ae3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions

View file

@ -371,7 +371,7 @@
src="js/ui/tool/generic.js?v=2bcd36d"
type="text/javascript"></script>
<script src="js/ui/tool/dream.js?v=a2932df" type="text/javascript"></script>
<script src="js/ui/tool/dream.js?v=f18c203" type="text/javascript"></script>
<script
src="js/ui/tool/maskbrush.js?v=1e8a893"
type="text/javascript"></script>

View file

@ -517,6 +517,17 @@ const _generate = async (endpoint, request, bb, options = {}) => {
});
};
const removeImg = async () => {
if (!images[at]) return;
images.splice(at, 1);
seeds.splice(at, 1);
if (at >= images.length) at = 0;
imageindextxt.textContent = `${at}/${images.length - 1}`;
var seed = seeds[at];
seedbtn.title = "Use seed " + seed;
redraw();
};
const makeMore = async () => {
const moreQ = await waitQueue();
try {
@ -596,6 +607,9 @@ const _generate = async (endpoint, request, bb, options = {}) => {
case "+":
makeMore();
break;
case "-":
removeImg();
break;
default:
switch (evn.code) {
case "ArrowRight":
@ -659,7 +673,11 @@ const _generate = async (endpoint, request, bb, options = {}) => {
const oncancelhandler = mouse.listen.world.btn.right.onclick.on(
(evn, state) => {
if (!state.dream_processed && bb.contains(evn.x, evn.y)) {
discardImg();
if (images.length > 1) {
removeImg();
} else {
discardImg();
}
imageCollection.inputElement.style.cursor = "auto";
state.dream_processed = true;
}
@ -743,6 +761,12 @@ const _generate = async (endpoint, request, bb, options = {}) => {
morebtn.addEventListener("click", makeMore);
imageSelectMenu.appendChild(morebtn);
const removebtn = document.createElement("button");
removebtn.textContent = "-";
removebtn.title = "Remove From Batch";
removebtn.addEventListener("click", removeImg);
imageSelectMenu.appendChild(removebtn);
const acceptbtn = document.createElement("button");
acceptbtn.textContent = "Y";
acceptbtn.title = "Apply Current";