From b23ca22305adad6fe961ec18faa598e3eaeafcf0 Mon Sep 17 00:00:00 2001 From: TheXeony <76243924+TheXeony@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:26:17 +0300 Subject: [PATCH 1/4] Update uieditor.js to v7 Pls update mod.json, because i can't (this commit fix errors in v7) --- scripts/uieditor.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/uieditor.js b/scripts/uieditor.js index 60bfac7..29eef8a 100644 --- a/scripts/uieditor.js +++ b/scripts/uieditor.js @@ -67,9 +67,9 @@ uieditor.removeProp = (elem, name) => { uieditor.build = () => { const squarei = new ImageButton.ImageButtonStyle(); - squarei.up = squarei.checked = Tex.buttonSquare; - squarei.down = Tex.buttonSquareDown; - squarei.over = squarei.checkedOver = Tex.buttonSquareOver; + squarei.up = squarei.checked = Tex.button; + squarei.down = Tex.buttonDown; + squarei.over = squarei.checkedOver = Tex.buttonOver; const dialog = extend(BaseDialog, "$toolbox.uieditor", { addElement(name) { @@ -109,7 +109,7 @@ uieditor.build = () => { elemw.add("$toolbox.uieditor.elements"); elemw.row(); elemw.pane(elems => { - elems.background(Tex.buttonSquare); + elems.background(Tex.button); elems.top(); elems.defaults().pad(6).height(32).top(); @@ -158,7 +158,7 @@ uieditor.build = () => { propw.add("$toolbox.uieditor.properties"); propw.row(); propw.pane(props => { - props.background(Tex.buttonSquare); + props.background(Tex.button); props.top(); props.defaults().pad(4); @@ -168,7 +168,7 @@ uieditor.build = () => { for (var i in element.properties) { let prop = props.table().growX().left().get(); - prop.background(Tex.buttonSquare); + prop.background(Tex.button); prop.add(i).width(70).padRight(6).left().get().alignment = Align.left; prop.defaults().fillX(); From 1b116970f556948cb9d2a584763a7e9d11ba19a0 Mon Sep 17 00:00:00 2001 From: TheXeony <76243924+TheXeony@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:30:08 +0300 Subject: [PATCH 2/4] Update mod.json to v7 ok, i can --- mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.json b/mod.json index 592232c..7ae1421 100644 --- a/mod.json +++ b/mod.json @@ -7,5 +7,5 @@ "version": "3.7.4", "dependencies": ["ui-lib"], "hidden": true, - "minGameVersion": 105 + "minGameVersion": 136 } From 52f19a40af48c9cfd0c2de38bea45a71ff6c5059 Mon Sep 17 00:00:00 2001 From: TheXeony <76243924+TheXeony@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:47:19 +0300 Subject: [PATCH 3/4] update elements.js to v7 --- scripts/elements.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/elements.js b/scripts/elements.js index 57c8b58..a4c90ec 100644 --- a/scripts/elements.js +++ b/scripts/elements.js @@ -127,7 +127,7 @@ const bool = (name, def) => { }, build(element, value, t) { - const label = t.button(value + "", Styles.clearTogglet, () => { + const label = t.button(value + "", Styles.clearTogglei, () => { value = !value; element.properties[name] = value; this.apply(element, value); @@ -187,7 +187,7 @@ const enumj = (name, enumj, def) => { }, build(element, value, t) { - const label = t.button(value, Styles.clearPartialt, () => { + const label = t.button(value, Styles.cleai, () => { ui.select(name + " enum", values, selected => { element.properties[name] = selected; this.apply(element, selected); From 6cf4eb459bf696bfde108339a99c095a102e905a Mon Sep 17 00:00:00 2001 From: TheXeony <76243924+TheXeony@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:50:01 +0300 Subject: [PATCH 4/4] update uieditor.js to v7 --- scripts/uieditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/uieditor.js b/scripts/uieditor.js index 29eef8a..936b490 100644 --- a/scripts/uieditor.js +++ b/scripts/uieditor.js @@ -117,7 +117,7 @@ uieditor.build = () => { elems.clear(); for (var i in uieditor.workspace) { const element = uieditor.workspace[i]; - elems.button(element.name, Styles.squaret, () => { + elems.button(element.name, Styles.cleart, () => { uieditor.editElement(element); }).growX().pad(8); elems.row();