sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

option to sync resolution and reticle size (issue 90)

Browse source
This commit is contained in:
tim h 2022-12-12 16:25:49 -06:00
parent 34b995998b
commit 82e943b12d
2 changed files with 56 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/index.js
View file

@ -468,12 +468,12 @@ const upscalerAutoComplete = createAutoComplete(
document.getElementById("upscaler-ac-select")
);
makeSlider(
const resSlider = makeSlider(
"Resolution",
document.getElementById("resolution"),
"resolution",
64,
1024,
2048,
64,
512,
2,
@ -971,6 +971,7 @@ imageCollection.element.addEventListener(
"wheel",
(evn) => {
evn.preventDefault();
_resolution_onwheel(evn);
},
{passive: false}
);
@ -988,3 +989,10 @@ function resetToDefaults() {
localStorage.clear();
}
}
const _resolution_onwheel = (evn) => {
if (toolbar._current_tool.state.matchResolution) {
resSlider.value =
stableDiffusionData.width - (64 * evn.deltaY) / Math.abs(evn.deltaY);
}
};

53
js/ui/tool/dream.js
View file

@ -884,9 +884,9 @@ const _dream_onwheel = (evn, state) => {
//
// TODO: Someone that has a smooth scrolling mouse should verify if this works with them.
const v = state.cursorSize - 128 * (evn.delta / Math.abs(evn.delta));
const v = state.cursorSize - 64 * (evn.delta / Math.abs(evn.delta));
state.cursorSize = state.setCursorSize(v + snap(v, 0, 128));
state.cursorSize = state.setCursorSize(v + snap(v, 0, 64));
state.mousemovecb(evn);
}
};
@ -914,6 +914,11 @@ const dreamTool = () =>
// Display Mask
setMask(state.invertMask ? "hold" : "clear");
// update cursor size if matching is enabled
if (state.matchResolution) {
state.setCursorSize(stableDiffusionData.width);
}
},
(state, opt) => {
// Clear Listeners
@ -934,7 +939,7 @@ const dreamTool = () =>
};
state.cursorSize = 512;
state.matchResolution = true;
state.snapToGrid = true;
state.invertMask = false;
state.overMaskPx = 0;
@ -982,9 +987,9 @@ const dreamTool = () =>
"cursorSize",
"Cursor Size",
{
min: 0,
min: 64,
max: 2048,
step: 128,
step: 64,
textStep: 2,
}
);
@ -992,6 +997,18 @@ const dreamTool = () =>
state.setCursorSize = cursorSizeSlider.setValue;
state.ctxmenu.cursorSizeSlider = cursorSizeSlider.slider;
// Match Resolution Checkbox
state.ctxmenu.matchResolutionLabel = _toolbar_input.checkbox(
state,
"matchResolution",
"Match Resolution",
() => {
if (state.matchResolution) {
resSlider.value = state.cursorSize;
}
}
).label;
// Snap to Grid Checkbox
state.ctxmenu.snapToGridLabel = _toolbar_input.checkbox(
state,
@ -1024,6 +1041,8 @@ const dreamTool = () =>
}
menu.appendChild(state.ctxmenu.cursorSizeSlider);
menu.appendChild(state.ctxmenu.matchResolutionLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.snapToGridLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.invertMaskLabel);
@ -1053,6 +1072,11 @@ const img2imgTool = () =>
// Display Mask
setMask(state.invertMask ? "hold" : "clear");
// update cursor size if matching is enabled
if (state.matchResolution) {
state.setCursorSize(stableDiffusionData.width);
}
},
(state, opt) => {
// Clear Listeners
@ -1072,6 +1096,7 @@ const img2imgTool = () =>
};
state.cursorSize = 512;
state.matchResolution = true;
state.snapToGrid = true;
state.invertMask = true;
state.fullResolution = false;
@ -1223,9 +1248,9 @@ const img2imgTool = () =>
"cursorSize",
"Cursor Size",
{
min: 0,
min: 64,
max: 2048,
step: 128,
step: 64,
textStep: 2,
}
);
@ -1233,6 +1258,18 @@ const img2imgTool = () =>
state.setCursorSize = cursorSizeSlider.setValue;
state.ctxmenu.cursorSizeSlider = cursorSizeSlider.slider;
// Match Resolution Checkbox
state.ctxmenu.matchResolutionLabel = _toolbar_input.checkbox(
state,
"matchResolution",
"Match Resolution",
() => {
if (state.matchResolution) {
resSlider.value = state.cursorSize;
}
}
).label;
// Snap To Grid Checkbox
state.ctxmenu.snapToGridLabel = _toolbar_input.checkbox(
state,
@ -1292,6 +1329,8 @@ const img2imgTool = () =>
}
menu.appendChild(state.ctxmenu.cursorSizeSlider);
menu.appendChild(state.ctxmenu.matchResolutionLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.snapToGridLabel);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.invertMaskLabel);