Skip to content

Commit

Permalink
1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
zombieyang committed Dec 2, 2024
1 parent dbb61e0 commit 5aa06e7
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 28 deletions.
11 changes: 11 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## [1.5.2] - 2024-12-02
1. optimize: provide queueX3 and queueX10 button in Edit panel.
2. optimize: new icon button for workflow save and comfy edit.
3. optimize: workflow list & page list style optimize
4. fix: some i18n didn't work in Comfy side.
5. fix: text area will blur automatically after linenum changed.
6. fix: extremely slow after reconnect.
7. fix: get image from PS would not cache image even canvas is not modified.
8. fix: live painting somethimes would not work in PageList, always would not work in WorkflowList.
9. fix: issues of Edit panel when many instances connecting with one Comfy.

## [1.5.1] - 2024-11-24
1. optimize: Widget list will now sort by name.
2. optimize: Textarea widget will auto resize.
Expand Down
Binary file modified javascript/plugins/sd-ppp_PS.ccx
Binary file not shown.
2 changes: 1 addition & 1 deletion javascript/sdppp-a1111.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion javascript/sdppp-comfy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sdppp",
"version": "1.5.1",
"version": "1.5.2",
"scripts": {
"watch": "nodemon -w typescripts/src -e mjs,js,jsx,mts,ts,tsx,json,css,html -x node typescripts/src/build.mjs",
"build": "NODE_ENV=production node typescripts/src/build.mjs && bash plugins/package.sh"
Expand Down
2 changes: 1 addition & 1 deletion plugins/photoshop/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugins/photoshop/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "sd-ppp",
"name": "SD-PPP",
"version": "1.5.1",
"version": "1.5.2",
"main": "index.html",
"manifestVersion": 5,
"host": {
Expand Down
32 changes: 16 additions & 16 deletions plugins/photoshop/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ sp-slider.sdppp-slider {

.panel-body {
flex: 1;
margin-top: 8px;
width: 400%;
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -122,28 +121,26 @@ sp-slider.sdppp-slider {
.workflow-edit-button {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 10px;
}

.workflow-edit-button sp-button {
flex: 1;
margin: 0 5px;
white-space: nowrap;
text-align: center;
overflow: hidden;
}


.workflow-edit-button sp-action-button {
cursor: pointer;
text-decoration: underline;
}

.client-list {
margin-top: -10px;
margin-bottom: 10px;
}

.client-list-item {
display: flex;
justify-content: space-between;
align-items: center;
height: 24px;
align-items: baseline;
position: relative;
margin: -6px 0;
}

.client-list-item .client-list-item-left {
Expand All @@ -165,12 +162,15 @@ sp-slider.sdppp-slider {
}

.client-list-item .client-list-item-right {
display: flex;
align-items: middle;
flex: 1;
/* display: flex;
align-items: middle; */
/* flex: 1;
text-align: right;
white-space: nowrap;
justify-content: end;
justify-content: end; */
position: absolute;
right: 0;
bottom: 2px;
}

.client-list-item .client-list-item-right sp-action-button {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "sd-ppp"
description = "getting/sending picture from/to Photoshop with a simple connection. Make Photoshop become the workspace of your ComfyUI."
version = "1.5.1"
version = "1.5.2"
license = { file = "LICENSE" }

[project.urls]
Expand Down
8 changes: 6 additions & 2 deletions sdppp_python/comfy/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,14 @@ def action(self, document_name):

class GetLayerNode:
RETURN_TYPES = ("LAYER", "BOUND", "LAYER_INFO")
RETURN_NAMES = ("layer_or_group", "layer_bound", "layer_info")
RETURN_NAMES = ("layer_or_group", "layer boundary", "layer_info")
FUNCTION = "action"
CATEGORY = "SD-PPP"

@classmethod
def IS_CHANGED(self, **kwargs):
print('getlayer is_changed')

@classmethod
def INPUT_TYPES(cls):
return {
Expand Down Expand Up @@ -247,7 +251,7 @@ def INPUT_TYPES(cls):
"document": ("DOCUMENT", {"default": None, "sdppp_type": "DOCUMENT"}),
},
"optional": {
"bound": ('BOUND', {"default": None}),
"bounds [optional]": ('BOUND', {"default": None}),
}
}

Expand Down
13 changes: 9 additions & 4 deletions sdppp_python/comfy/nodes_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,17 @@ def VALIDATE_INPUTS(s):

@classmethod
def IS_CHANGED(self, unique_id, prompt, layer_or_group, bound="", document=""):
linked_style, document = parse_params(unique_id, prompt, layer_or_group, document)
# 'prompt' is not valid in IS_CHANGED
# so we cant figure out if this node is using linked style or not
# just consider to support linked style here.
if not isinstance(document, list) or len(document) == 0 or not isinstance(document[0], str):
return np.random.rand()

document = json.loads(document[0])
if ('instance_id' not in document) or (document['instance_id'] not in sdppp.backend_instances):
return np.random.rand()

return sdppp.backend_instances[document['instance_id']].data['canvasStateID']
return sdppp.backend_instances[document['instance_id']].store.data['canvasStateID']

@classmethod
def INPUT_TYPES(cls):
Expand All @@ -81,7 +86,7 @@ def INPUT_TYPES(cls):
"optional": {
# compat combo selection type
"document": ("STRING", {"default": "", "sdppp_type": "DOCUMENT_nameid"}),
"bound": ('BOUND', {"default": None}),
"bounds [optional]": ('BOUND', {"default": None}),
},
"hidden": {
"unique_id": "UNIQUE_ID",
Expand Down Expand Up @@ -201,7 +206,7 @@ def INPUT_TYPES(cls):
"optional": {
# compat combo selection type
"document": ("STRING", {"default": "", "sdppp_type": "DOCUMENT_nameid"}),
"bound": ('BOUND', {"default": None}),
"bounds [optional]": ('BOUND', {"default": None}),
},
"hidden": {
"unique_id": "UNIQUE_ID",
Expand Down

0 comments on commit 5aa06e7

Please sign in to comment.