From 490636fa6651a6037adda1a3603877ede47e6a1a Mon Sep 17 00:00:00 2001
From: Michael Leuschel <leuschel@uni-duesseldorf.de>
Date: Wed, 14 Oct 2020 11:01:57 +0200
Subject: [PATCH] use include attribute
---
Button/button.json | 20 +-------------------
Button/button_extra.json | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 Button/button_extra.json
diff --git a/Button/button.json b/Button/button.json
index aba2526..140510b 100644
--- a/Button/button.json
+++ b/Button/button.json
@@ -1,5 +1,6 @@
{
"svg": "button.svg",
+ "include": "button_extra.json",
"items": [
{
"id": "button",
@@ -11,12 +12,6 @@
"attr": "stroke-width",
"value": "IF ENABLED(\"press_button\") THEN 6 ELSE 1 END",
"ignore": "is now used in hover below"
- },
- {
- "id": "button_%0",
- "attr": "visibility",
- "value": "IF button=%0 THEN \"visible\" ELSE \"hidden\" END",
- "repeat": [ "TRUE", "FALSE" ]
}
],
"events": [
@@ -25,19 +20,6 @@
"event": "toggle_button",
"hovers": [{ "attr":"stroke-width", "enter":"6", "leave":"1"},
{ "attr":"opacity", "enter":"0.8", "leave":"1.0"}]
- },
- {
- "id": "button_TRUE",
- "event": "toggle_button",
- "hovers": [{ "attr":"stroke-width", "enter":"3", "leave":"1", "id":"button"},
- { "attr":"opacity", "enter":"0.5", "leave":"0.8"}]
- },
- {
- "id": "button_FALSE",
- "event": "set_button",
- "predicates" : ["newVal = bool(%shiftKey=FALSE)"],
- "hovers": [{ "attr":"stroke-width", "enter":"5", "leave":"1", "id":"button"},
- { "attr":"opacity", "enter":"0.85", "leave":"1.0"}]
}
]
}
diff --git a/Button/button_extra.json b/Button/button_extra.json
new file mode 100644
index 0000000..5da9659
--- /dev/null
+++ b/Button/button_extra.json
@@ -0,0 +1,28 @@
+{
+ "svg": "button.svg",
+ "comment": "treatment of button_TRUE and button_FALSE extra buttons",
+ "items": [
+ {
+ "id": "button_%0",
+ "attr": "visibility",
+ "value": "IF button=%0 THEN \"visible\" ELSE \"hidden\" END",
+ "repeat": [ "TRUE", "FALSE" ]
+ }
+ ],
+ "events": [
+ {
+ "id": "button_TRUE",
+ "event": "toggle_button",
+ "hovers": [{ "attr":"stroke-width", "enter":"3", "leave":"1", "id":"button"},
+ { "attr":"opacity", "enter":"0.5", "leave":"0.8"}]
+ },
+ {
+ "id": "button_FALSE",
+ "event": "set_button",
+ "optional": true,
+ "predicates" : ["newVal = bool(%shiftKey=FALSE)"],
+ "hovers": [{ "attr":"stroke-width", "enter":"5", "leave":"1", "id":"button"},
+ { "attr":"opacity", "enter":"0.85", "leave":"1.0"}]
+ }
+ ]
+}
--
GitLab