StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

improved UI

Browse Source
This commit is contained in:
Stephan Richter
2021-12-07 21:49:40 +01:00
parent 1b83019dd2
commit 3d8d43771a
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.5.37</version> <version>1.5.38</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

12
src/main/java/de/srsoftware/web4rail/actions/ActionList.java
View File

@@ -105,13 +105,6 @@ public class ActionList extends Action implements Iterable<Action>{
return speed; return speed;
} }
private static void highlight(Window win, Action action) {
BaseClass scrollTarget = action.parent();
if (isNull(scrollTarget)) scrollTarget = action;
win.children().add(new Tag("script").content("document.getElementById('"+scrollTarget.id()+"').scrollIntoView({ behavior: \"smooth\" }); document.getElementById('"+action.id()+"').classList.add('highlight');"));
}
@Override @Override
public Iterator<Action> iterator() { public Iterator<Action> iterator() {
return actions.iterator(); return actions.iterator();
@@ -253,10 +246,7 @@ public class ActionList extends Action implements Iterable<Action>{
return start(action); return start(action);
case ACTION_UPDATE: case ACTION_UPDATE:
Object res = action.update(params); Object res = action.update(params);
if (res instanceof Window) { if (res instanceof Window) ((Window) res).highlight(action);
Window win = (Window) res;
highlight(win,action);
}
return res; return res;
} }
return t("Unknown action: {}",command); return t("Unknown action: {}",command);

2
src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
View File

@@ -62,7 +62,7 @@ public class ConditionalAction extends ActionList {
public <T extends Tag> T listAt(T parent) { public <T extends Tag> T listAt(T parent) {
T tag = super.listAt(parent); T tag = super.listAt(parent);
if (!elseActions.isEmpty()) { if (!elseActions.isEmpty()) {
Tag div = new Tag("div").clazz("else"); Tag div = new Tag("div").id(elseActions.id().toString()).clazz("else");
new Tag("span").content(t("else:")+NBSP).addTo(div); new Tag("span").content(t("else:")+NBSP).addTo(div);
elseActions.listAt(div); elseActions.listAt(div);
div.addTo(tag); div.addTo(tag);

14
src/main/java/de/srsoftware/web4rail/conditions/Condition.java
View File

@@ -16,6 +16,7 @@ import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Params; import de.srsoftware.web4rail.Params;
import de.srsoftware.web4rail.Plan; import de.srsoftware.web4rail.Plan;
import de.srsoftware.web4rail.actions.Action; import de.srsoftware.web4rail.actions.Action;
import de.srsoftware.web4rail.actions.ActionList;
import de.srsoftware.web4rail.tags.Checkbox; import de.srsoftware.web4rail.tags.Checkbox;
import de.srsoftware.web4rail.tags.Fieldset; import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Select; import de.srsoftware.web4rail.tags.Select;
@@ -53,7 +54,18 @@ public abstract class Condition extends BaseClass {
case ACTION_PROPS: case ACTION_PROPS:
return condition.properties(); return condition.properties();
case ACTION_UPDATE: case ACTION_UPDATE:
return condition.update(params); Object res = condition.update(params);
if (res instanceof Window) {
BaseClass parent = condition.parent();
while (isSet(parent)) {
if (parent instanceof ActionList) {
((Window) res).highlight(parent);
break;
}
parent = parent.parent();
}
}
return res;
} }
return t("Unknown action: {}",action); return t("Unknown action: {}",action);
} }

8
src/main/java/de/srsoftware/web4rail/tags/Window.java
View File

@@ -1,6 +1,7 @@
package de.srsoftware.web4rail.tags; package de.srsoftware.web4rail.tags;
import de.srsoftware.tools.Tag; import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass;
/** /**
* @author Stephan Richter, SRSoftware 2020-2021 * * @author Stephan Richter, SRSoftware 2020-2021 *
@@ -24,4 +25,11 @@ public class Window extends Tag{
.attr("onclick", "return swapTiling();") .attr("onclick", "return swapTiling();")
.content("◧").addTo(this); .content("◧").addTo(this);
} }
public void highlight(BaseClass element) {
BaseClass scrollTarget = element.parent();
if (scrollTarget == null) scrollTarget = element;
children().add(new Tag("script").content("document.getElementById('"+scrollTarget.id()+"').scrollIntoView({ behavior: \"smooth\" }); document.getElementById('"+element.id()+"').classList.add('highlight');"));
}
} }