From 0bb9dfa3daff2a6cdf603ff55881a8cbbd07cc64 Mon Sep 17 00:00:00 2001 From: minkee Lee Date: Thu, 23 Jul 2015 14:31:36 +0900 Subject: [PATCH] Revert "qt-option: Modified direct-rendering option." This reverts commit 930d5c0127f90835ce4418327b23c6637f6a6bbd. Change-Id: I246fa7f70719b4e3f52dc87595a81c57bba909c3 Signed-off-by: minkee.lee --- .../manager/vms/option/CommonOptionFactroy.java | 3 +++ .../manager/vms/option/DisplayModeOption.java | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java b/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java index 40d91b2..cb6cc43 100644 --- a/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java +++ b/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java @@ -123,6 +123,9 @@ public abstract class CommonOptionFactroy implements IOptionFactory { list.add(Option.getInstance(FrontCameraOption.class)); } } + + } else if (name.equals(ItemName.DISPLAY_MODE)) { + list.add(Option.getInstance(DisplayModeOption.class)); } } diff --git a/src/org/tizen/emulator/manager/vms/option/DisplayModeOption.java b/src/org/tizen/emulator/manager/vms/option/DisplayModeOption.java index 2a8b989..82b35bc 100644 --- a/src/org/tizen/emulator/manager/vms/option/DisplayModeOption.java +++ b/src/org/tizen/emulator/manager/vms/option/DisplayModeOption.java @@ -38,15 +38,21 @@ public class DisplayModeOption extends Option { @Override public void getLaunchArgument(LaunchConfig config, VMProperty property) throws VMWorkerException { - String rendering = null; - if (!EmulatorManager.isMac() - && property.getConfiguration().getUsability().isHwGLAcceleration()) { - rendering = "onscreen"; - } else { - rendering = "offscreen"; + if (checkOn(property.getPropertyValue().getAdvancedOptionSubValue( + "displayMode", "qtEnable"))) { + + String rendering = null; + if (!EmulatorManager.isMac() + && property.getConfiguration().getUsability().isHwGLAcceleration()) { + rendering = "onscreen"; + + } else { + rendering = "offscreen"; + } + config.addQemuOption("-display", "maru_qt,rendering=" + rendering); } - config.addQemuOption("-display", "maru_qt,rendering=" + rendering); + } } -- 2.7.4