| rjw | 1f88458 | 2022-01-06 17:20:42 +0800 | [diff] [blame^] | 1 | From c9120f0c15f901f507c0c626b7225f4e93fca700 Mon Sep 17 00:00:00 2001 |
| 2 | From: Qian Hu <Qian.Hu@mediatek.com> |
| 3 | Date: Tue, 24 Sep 2019 11:21:23 +0800 |
| 4 | Subject: [PATCH 1/8] [[PATCH 1/9] hmi-controller: use output_w/h instead of |
| 5 | current_mode_w/h |
| 6 | |
| 7 | make use of output->w/h instead of output->current_mode->w/h, |
| 8 | output->w/h have involve factor of transform and scale |
| 9 | |
| 10 | Signed-off-by: Qian Hu <Qian.Hu@mediatek.com> |
| 11 | --- |
| 12 | ivi-shell/hmi-controller.c | 12 ++++++------ |
| 13 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 14 | |
| 15 | diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c |
| 16 | index a0e49ba..c4f106d 100644 |
| 17 | --- a/ivi-shell/hmi-controller.c |
| 18 | +++ b/ivi-shell/hmi-controller.c |
| 19 | @@ -804,8 +804,8 @@ hmi_controller_create(struct weston_compositor *ec) |
| 20 | base_layer = MEM_ALLOC(1 * sizeof(struct hmi_controller_layer)); |
| 21 | base_layer->x = 0; |
| 22 | base_layer->y = 0; |
| 23 | - base_layer->width = output->current_mode->width; |
| 24 | - base_layer->height = output->current_mode->height; |
| 25 | + base_layer->width = output->width; |
| 26 | + base_layer->height = output->height; |
| 27 | base_layer->id_layer = |
| 28 | hmi_ctrl->hmi_setting->base_layer_id + |
| 29 | (i * hmi_ctrl->hmi_setting->base_layer_id_offset); |
| 30 | @@ -824,8 +824,8 @@ hmi_controller_create(struct weston_compositor *ec) |
| 31 | application_layer = MEM_ALLOC(1 * sizeof(struct hmi_controller_layer)); |
| 32 | application_layer->x = 0; |
| 33 | application_layer->y = 0; |
| 34 | - application_layer->width = output->current_mode->width; |
| 35 | - application_layer->height = output->current_mode->height - panel_height; |
| 36 | + application_layer->width = output->width; |
| 37 | + application_layer->height = output->height - panel_height; |
| 38 | application_layer->id_layer = |
| 39 | hmi_ctrl->hmi_setting->application_layer_id + |
| 40 | (i * hmi_ctrl->hmi_setting->base_layer_id_offset); |
| 41 | @@ -841,9 +841,9 @@ hmi_controller_create(struct weston_compositor *ec) |
| 42 | hmi_ctrl->workspace_background_layer.x = 0; |
| 43 | hmi_ctrl->workspace_background_layer.y = 0; |
| 44 | hmi_ctrl->workspace_background_layer.width = |
| 45 | - output->current_mode->width; |
| 46 | + output->width; |
| 47 | hmi_ctrl->workspace_background_layer.height = |
| 48 | - output->current_mode->height - panel_height; |
| 49 | + output->height - panel_height; |
| 50 | |
| 51 | hmi_ctrl->workspace_background_layer.id_layer = |
| 52 | hmi_ctrl->hmi_setting->workspace_background_layer_id; |
| 53 | -- |
| 54 | 2.6.4 |
| 55 | |