Skip to content

Update to v7 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheXeony wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to v7 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b23ca22
Update uieditor.js to v7
TheXeony Jul 26, 2022
1b11697
Update mod.json to v7
TheXeony Jul 26, 2022
52f19a4
update elements.js to v7
TheXeony Jul 26, 2022
6cf4eb4
update uieditor.js to v7
TheXeony Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"version": "3.7.4",
"dependencies": ["ui-lib"],
"hidden": true,
"minGameVersion": 105
"minGameVersion": 136
}
4 changes: 2 additions & 2 deletions scripts/elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions scripts/uieditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -109,15 +109,15 @@ 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();

uieditor.rebuild = () => {
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();
Expand Down Expand Up @@ -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);

Expand All @@ -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();
Expand Down