mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-10 21:42:37 +08:00
Merge branch 'Main' into feature/preview-latent
This commit is contained in:
commit
92dc992a6b
@ -17,7 +17,13 @@ class LatentPreviewer:
|
|||||||
|
|
||||||
def decode_latent_to_preview_image(self, preview_format, x0):
|
def decode_latent_to_preview_image(self, preview_format, x0):
|
||||||
preview_image = self.decode_latent_to_preview(x0)
|
preview_image = self.decode_latent_to_preview(x0)
|
||||||
preview_image = ImageOps.contain(preview_image, (MAX_PREVIEW_RESOLUTION, MAX_PREVIEW_RESOLUTION), Image.ANTIALIAS)
|
|
||||||
|
if hasattr(Image, 'Resampling'):
|
||||||
|
resampling = Image.Resampling.BILINEAR
|
||||||
|
else:
|
||||||
|
resampling = Image.ANTIALIAS
|
||||||
|
|
||||||
|
preview_image = ImageOps.contain(preview_image, (MAX_PREVIEW_RESOLUTION, MAX_PREVIEW_RESOLUTION), resampling)
|
||||||
|
|
||||||
preview_type = 1
|
preview_type = 1
|
||||||
if preview_format == "JPEG":
|
if preview_format == "JPEG":
|
||||||
|
|||||||
@ -368,7 +368,11 @@ export class ComfyApp {
|
|||||||
shiftY = w.last_y;
|
shiftY = w.last_y;
|
||||||
if (w.computeSize) {
|
if (w.computeSize) {
|
||||||
shiftY += w.computeSize()[1] + 4;
|
shiftY += w.computeSize()[1] + 4;
|
||||||
} else {
|
}
|
||||||
|
else if(w.computedHeight) {
|
||||||
|
shiftY += w.computedHeight;
|
||||||
|
}
|
||||||
|
else {
|
||||||
shiftY += LiteGraph.NODE_WIDGET_HEIGHT + 4;
|
shiftY += LiteGraph.NODE_WIDGET_HEIGHT + 4;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -129,6 +129,7 @@ function addMultilineWidget(node, name, opts, app) {
|
|||||||
w.y = y;
|
w.y = y;
|
||||||
if (w.type === "customtext") {
|
if (w.type === "customtext") {
|
||||||
y += freeSpace;
|
y += freeSpace;
|
||||||
|
w.computedHeight = freeSpace - multi.length*4;
|
||||||
} else if (w.computeSize) {
|
} else if (w.computeSize) {
|
||||||
y += w.computeSize()[1] + 4;
|
y += w.computeSize()[1] + 4;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user