aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2018-07-25 18:46:18 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2018-07-25 18:46:18 +0900
commitb170de2744c1987a4a16f71275785bbd6e2f7e45 (patch)
treeb4c29edaa0b8ce390590143fe43a99a6be53b6f8
parente4fcbf1b100ec2d926f7fbba5b1246336d05d436 (diff)
add fsbtn as nearhomescreensandbox/zheng_wenlong/nearhomescreen
-rw-r--r--layers.json2
-rw-r--r--layers.json.split2
-rw-r--r--src/db/areas.db6
-rw-r--r--src/layers.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/layers.json b/layers.json
index fddd258..6ce041c 100644
--- a/layers.json
+++ b/layers.json
@@ -26,7 +26,7 @@
"comment": "Range of IDs that will always be placed on layer 1001"
},
{
- "role": "software_keyboard",
+ "role": "fsbtn",
"name": "NearHomeScreen",
"layer_id": 1002,
"comment": "NearHomeScreen is the part of HomeScreen. The z order of this layer is upper than FarHomeScreen"
diff --git a/layers.json.split b/layers.json.split
index 641e2f4..4850535 100644
--- a/layers.json.split
+++ b/layers.json.split
@@ -35,7 +35,7 @@
]
},
{
- "role": "software_keyboard",
+ "role": "fsbtn",
"name": "NearHomeScreen",
"layer_id": 1002,
"comment": "NearHomeScreen is the part of HomeScreen. The z order of this layer is upper than FarHomeScreen"
diff --git a/src/db/areas.db b/src/db/areas.db
index 03ddfe4..d2514bc 100644
--- a/src/db/areas.db
+++ b/src/db/areas.db
@@ -37,12 +37,12 @@
}
},
{
- "name": "software_keyboard",
+ "name": "fsbtn",
"rect": {
"x": 0,
- "y": 962,
+ "y": 0,
"w": 1080,
- "h": 744
+ "h": 1920
}
},
{
diff --git a/src/layers.cpp b/src/layers.cpp
index b961157..2999f08 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -363,7 +363,7 @@ const char* layer_map::kDefaultAreaDb = "{ \
} \
}, \
{ \
- \"name\": \"software_keyboard\", \
+ \"name\": \"fsbtn\", \
\"rect\": { \
\"x\": 0, \
\"y\": 962, \