yawaflua/Informatis
1
0
Fork 0
mirror of https://github.com/yawaflua/Informatis.git synced 2025-12-10 20:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

should i draw brush?

Browse Source
This commit is contained in:
sharlottes
2022-04-20 00:51:29 +09:00
parent e0c5cdc7d1
commit 33a4a6664a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/unitinfo/ui/windows/MapEditorDisplay.java
View File

@@ -56,7 +56,7 @@ public class MapEditorDisplay extends Window implements Updatable {
table.top().background(Styles.black8); table.top().background(Styles.black8);
table.table(t->{ table.table(t->{
t.left().background(Tex.underline2); t.left().background(Tex.underline2);
t.label(()->"[accent]"+selected.localizedName+"[] "+selected.emoji()); t.label(()->selected==null?"[gray]None[]":"[accent]"+selected.localizedName+"[] "+selected.emoji());
t.add(search).growX().pad(8).name("search"); t.add(search).growX().pad(8).name("search");
}).growX().row(); }).growX().row();
table.add(new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false)).grow().name("editor-pane"); table.add(new OverScrollPane(rebuild(), Styles.nonePane, scrollPos).disableScroll(true, false)).grow().name("editor-pane");
@@ -71,7 +71,7 @@ public class MapEditorDisplay extends Window implements Updatable {
heat = 0f; heat = 0f;
resetPane(); resetPane();
} }
if(tool != null) { if(tool != null && selected != null && !window.hasMouse()) {
if(Core.input.isTouched()) { if(Core.input.isTouched()) {
if(!(!mobile&&Core.input.keyDown(KeyCode.mouseLeft))) return; if(!(!mobile&&Core.input.keyDown(KeyCode.mouseLeft))) return;
if(tool== EditorTool.line) { if(tool== EditorTool.line) {
@@ -154,9 +154,9 @@ public class MapEditorDisplay extends Window implements Updatable {
options.top().left(); options.top().left();
options.table(title -> title.left().background(Tex.underline2).add("Options [accent]"+(tool!=null&&tool.mode>=0&&tool.mode<tool.altModes.length?tool.altModes[tool.mode]:"")+"[]")).growX().row(); options.table(title -> title.left().background(Tex.underline2).add("Options [accent]"+(tool!=null&&tool.mode>=0&&tool.mode<tool.altModes.length?tool.altModes[tool.mode]:"")+"[]")).growX().row();
options.table(option-> { options.table(option-> {
option.defaults().size(300f, 70f).left();
if(tool==null) return; if(tool==null) return;
option.top().left();
for (int i = 0; i < tool.altModes.length; i++) { for (int i = 0; i < tool.altModes.length; i++) {
int mode = i; int mode = i;
String name = tool.altModes[i]; String name = tool.altModes[i];
@@ -168,10 +168,9 @@ public class MapEditorDisplay extends Window implements Updatable {
b.add(Core.bundle.get("toolmode." + name + ".description")).color(Color.lightGray).left(); b.add(Core.bundle.get("toolmode." + name + ".description")).color(Color.lightGray).left();
}, () -> { }, () -> {
tool.mode = (tool.mode == mode ? -1 : mode); tool.mode = (tool.mode == mode ? -1 : mode);
}).update(b -> b.setChecked(tool.mode == mode)); }).update(b -> b.setChecked(tool.mode == mode)).margin(12f).growX().row();
option.row();
} }
}); }).grow();
}).left().width(window.getWidth() / 2).margin(8f).growY(); }).left().width(window.getWidth() / 2).margin(8f).growY();
}).grow(); }).grow();
}); });