blob: d7f23a305ff42e1be68acf48723bfe8fbc01922a [file] [log] [blame]
From 05da7cf21de58425828099100358cddab67d2f6f Mon Sep 17 00:00:00 2001
From: Jia Rong <jia.rong@mediatek.com>
Date: Fri, 20 Apr 2018 10:49:48 +0800
Subject: [PATCH 1/9] hmi-controller: use output_w/h instead of
current_mode_w/h
make use of output->w/h instead of output->current_mode->w/h,
output->w/h have involve factor of transform and scale
Test: tesk ok
Change-Id: Icd902acef813c1674020cf2af2352388539f9e37
Signed-off-by: Jia Rong <jia.rong@mediatek.com>
CR-Id: AUTO00016576
---
ivi-shell/hmi-controller.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index 7b2f270..e47b499 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -802,8 +802,8 @@ hmi_controller_create(struct weston_compositor *ec)
base_layer = MEM_ALLOC(1 * sizeof(struct hmi_controller_layer));
base_layer->x = 0;
base_layer->y = 0;
- base_layer->width = output->current_mode->width;
- base_layer->height = output->current_mode->height;
+ base_layer->width = output->width;
+ base_layer->height = output->height;
base_layer->id_layer =
hmi_ctrl->hmi_setting->base_layer_id +
(i * hmi_ctrl->hmi_setting->base_layer_id_offset);
@@ -822,8 +822,8 @@ hmi_controller_create(struct weston_compositor *ec)
application_layer = MEM_ALLOC(1 * sizeof(struct hmi_controller_layer));
application_layer->x = 0;
application_layer->y = 0;
- application_layer->width = output->current_mode->width;
- application_layer->height = output->current_mode->height - panel_height;
+ application_layer->width = output->width;
+ application_layer->height = output->height - panel_height;
application_layer->id_layer =
hmi_ctrl->hmi_setting->application_layer_id +
(i * hmi_ctrl->hmi_setting->base_layer_id_offset);
@@ -839,9 +839,9 @@ hmi_controller_create(struct weston_compositor *ec)
hmi_ctrl->workspace_background_layer.x = 0;
hmi_ctrl->workspace_background_layer.y = 0;
hmi_ctrl->workspace_background_layer.width =
- output->current_mode->width;
+ output->width;
hmi_ctrl->workspace_background_layer.height =
- output->current_mode->height - panel_height;
+ output->height - panel_height;
hmi_ctrl->workspace_background_layer.id_layer =
hmi_ctrl->hmi_setting->workspace_background_layer_id;
--
1.9.1