From ceecd410c3f2314e4f294c1d1f8f6d81e81cb0f8 Mon Sep 17 00:00:00 2001
From: "minkee.lee" <minkee.lee@samsung.com>
Date: Mon, 30 Nov 2015 14:16:32 +0900
Subject: [PATCH] vm-modify: fix mouse scroll in windows OS.

- Item-list gets focus when advance option is shown
or item is clicked.

Change-Id: I8cf45709fbf2caca8aa85238d80275f324e3d4c1
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---
 .../manager/ui/renewal/dialog/ItemListComp.java        |  6 +++++-
 .../item/modify/comp/AdvancedPropertyViewer.java       |  4 ++++
 .../ui/renewal/item/modify/comp/ModifyItem.java        | 18 ++++++++++++++++++
 .../ui/renewal/tableviewer/CreateVMTableViewer.java    |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java
index c01ca51..a049a44 100644
--- a/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java
@@ -92,6 +92,9 @@ public class ItemListComp {
 		this.itemList = itemList;
 	}
 
+	public void setFocus() {
+		scrolledContent.setFocus();
+	}
 
 
 	public void setDialogMode(DIALOG_MODE mode) {
@@ -126,7 +129,7 @@ public class ItemListComp {
 
 		// (For Windows OS)
 		//  This is needed to receive mouse-scroll in dialog
-		itemList.get(0).setFocus();
+		setFocus();
 
 		isAllItemCreated = true;
 
@@ -288,6 +291,7 @@ public class ItemListComp {
 			item.setInitialValue(propertyValue);
 		}
 		changeItemList(itemList, imageItems);
+
 		checkValid();
 
 		layoutScrolledComposite();
diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java
index bd056aa..0286131 100644
--- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java
@@ -119,6 +119,10 @@ public class AdvancedPropertyViewer {
 		makeAdvancedItem();
 	}
 
+	public void setFocus() {
+		itemListComp.setFocus();
+	}
+
 
 	public void changeItemList(BaseImage baseImage, PropertyValue value) {
 
diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java
index 54c38ce..4b91912 100644
--- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java
@@ -39,7 +39,9 @@ import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Listener;
 import org.tizen.emulator.manager.renewal.resources.ColorResources;
 import org.tizen.emulator.manager.ui.renewal.dialog.VMModifyDialog;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
@@ -119,6 +121,22 @@ public class ModifyItem {
 	public void create() {
 		itemTitle.create(dialogItem.isDrawBottomLine());
 		createEmptyBody();
+
+		addMouseListener();
+	}
+
+	private void addMouseListener() {
+		Listener listener = new Listener() {
+
+			@Override
+			public void handleEvent(Event e) {
+				if (e.type == SWT.MouseDown) {
+					setFocus();
+				}
+			}
+		};
+		itemTitle.addListener(SWT.MouseDown, listener);
+		bodyComp.addListener(SWT.MouseDown, listener);
 	}
 
 	private void createEmptyBody() {
diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java
index f93154a..3af7963 100644
--- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java
+++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java
@@ -430,6 +430,7 @@ public class CreateVMTableViewer extends AbstractTableViewer {
 			} else {
 				form.SASH_WIDTH = 5;
 				form.setWeights(new int[]{5,7});
+				advancedViewer.setFocus();
 			}
 			isOpen = !isOpen;
 		}
-- 
2.7.4