diff options
| author |   zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2018-08-06 18:38:00 +0900 |
|---|---|---|
| committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2018-08-06 18:38:00 +0900 |
| commit | c447b8902934dc59166d5ae2b558fbb886b01887 (patch) | |
| tree | ba9aef18560693836d611e795650f2328fe52762 | |
| parent | 000e5f8983984d65cc7599908541801ec2babed2 (diff) | |
Add horizontal layer
| -rw-r--r-- | layers.json | 4 | ||||
| -rw-r--r-- | layers.json.split | 4 | ||||
| -rw-r--r-- | src/db/areas.db | 54 | ||||
| -rw-r--r-- | src/window_manager.cpp | 4 |
4 files changed, 35 insertions, 31 deletions
diff --git a/layers.json b/layers.json index fddd258..97599a3 100644 --- a/layers.json +++ b/layers.json @@ -14,7 +14,7 @@ "comment": "Single BackGround layer map for the map, radio, music and video" }, { - "role": "homescreen", + "role": "", "name": "FarHomeScreen", "layer_id": 1000, "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen" @@ -26,7 +26,7 @@ "comment": "Range of IDs that will always be placed on layer 1001" }, { - "role": "software_keyboard", + "role": "homescreen", "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..07b2ea4 100644 --- a/layers.json.split +++ b/layers.json.split @@ -14,7 +14,7 @@ "comment": "Single BackGround layer map for the map, radio, music and video" }, { - "role": "homescreen", + "role": "", "name": "FarHomeScreen", "layer_id": 1000, "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen" @@ -35,7 +35,7 @@ ] }, { - "role": "software_keyboard", + "role": "homescreen", "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..a8039fa 100644 --- a/src/db/areas.db +++ b/src/db/areas.db @@ -5,80 +5,80 @@ "rect": { "x": 0, "y": 0, - "w": 1080, - "h": 1920 + "w": 1920, + "h": 1080 } }, { "name": "normal.full", "rect": { "x": 0, - "y": 218, - "w": 1080, - "h": 1488 + "y": 0, + "w": 1920, + "h": 1080 } }, { "name": "split.main", "rect": { "x": 0, - "y": 218, - "w": 1080, - "h": 744 + "y": 0, + "w": 1920, + "h": 540 } }, { "name": "split.sub", "rect": { "x": 0, - "y": 962, - "w": 1080, - "h": 744 + "y": 540, + "w": 1920, + "h": 540 } }, { - "name": "software_keyboard", + "name": "skb", "rect": { "x": 0, - "y": 962, - "w": 1080, - "h": 744 + "y": 0, + "w": 1920, + "h": 1080 } }, { "name": "restriction.normal", "rect": { "x": 0, - "y": 218, - "w": 1080, - "h": 1488 + "y": 0, + "w": 1920, + "h": 1808 } }, { "name": "restriction.split.main", "rect": { "x": 0, - "y": 218, - "w": 1080, - "h": 744 + "y": 0, + "w": 1920, + "h": 540 } }, { "name": "restriction.split.sub", "rect": { "x": 0, - "y": 962, - "w": 1080, - "h": 744 + "y": 540, + "w": 1920, + "h": 540 } }, { "name": "on_screen", "rect": { "x": 0, - "y": 218, - "w": 1080, - "h": 1488 + "y": 0, + "w": 1920, + "h": 1080 } } ] diff --git a/src/window_manager.cpp b/src/window_manager.cpp index aa42d82..dd757d6 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -1133,6 +1133,10 @@ WMError WindowManager::setInvisibleTask(const std::string &role, bool split) { continue; } + if (l.second.role == "homescreen") + { + continue; + } HMI_DEBUG("wm", "debug: main %d , sub : %d", l.second.state.main, l.second.state.sub); if (l.second.state.main != -1) { |