Target Explorer: Fix control decoration painted on top of other controls

5 files changed, 10 insertions, 8 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/filetransfer/AddEditFileTransferDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/filetransfer/AddEditFileTransferDialog.java
index 1ea6ee780..ef1616cfd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/filetransfer/AddEditFileTransferDialog.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/filetransfer/AddEditFileTransferDialog.java
@@ -154,7 +154,7 @@ public class AddEditFileTransferDialog extends CustomTitleAreaDialog {
 		host.setAdjustBackgroundColor(true);
 		host.setParentControlIsInnerPanel(true);
 		host.setupPanel(panel);
-		host.doCreateControlDecoration(host.getEditFieldControl());
+		host.doCreateControlDecoration(host.getEditFieldControl(), panel);
 
 		// Create the section sub controls
 		target = new BaseEditBrowseTextControl(null) {
@@ -186,7 +186,7 @@ public class AddEditFileTransferDialog extends CustomTitleAreaDialog {
 		target.setAdjustBackgroundColor(true);
 		target.setParentControlIsInnerPanel(true);
 		target.setupPanel(panel);
-		target.doCreateControlDecoration(target.getEditFieldControl());
+		target.doCreateControlDecoration(target.getEditFieldControl(), panel);
 
 		spacer = new Label(panel, SWT.NONE);
 		spacer = new Label(panel, SWT.NONE);
@@ -204,7 +204,7 @@ public class AddEditFileTransferDialog extends CustomTitleAreaDialog {
 		options.setAdjustBackgroundColor(true);
 		options.setParentControlIsInnerPanel(true);
 		options.setupPanel(panel);
-		options.doCreateControlDecoration(target.getEditFieldControl());
+		options.doCreateControlDecoration(target.getEditFieldControl(), panel);
 
 		applyDialogFont(panel);
 	}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java
index 9f38ca367..01be12277 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTabSection.java
@@ -125,7 +125,7 @@ public class LaunchConfigurationMainTabSection extends AbstractSection implement
 		processImage.setParentControlIsInnerPanel(true);
 		processImage.setFormToolkit(toolkit);
 		processImage.setupPanel(client);
-		processImage.doCreateControlDecoration(processImage.getEditFieldControl());
+		processImage.doCreateControlDecoration(processImage.getEditFieldControl(), client);
 
 		processArguments = new BaseEditBrowseTextControl(null) {
 			@Override
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java
index f50de0c8d..ce27af2c6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.fieldassist.ControlDecoration;
 import org.eclipse.jface.fieldassist.FieldDecoration;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.tcf.te.ui.controls.nls.Messages;
 
@@ -45,11 +46,12 @@ public abstract class AbstractDecoratedDialogPageControl extends BaseDialogPageC
 	 * the given control. The method is called after the control has been created.
 	 *
 	 * @param control The control. Must not be <code>null</code>.
+	 * @param parent The SWT composite within which the decoration should be rendered. Must not be <code>null</code>.
 	 * @return The control decoration object instance.
 	 */
-	public ControlDecoration doCreateControlDecoration(Control control) {
+	public ControlDecoration doCreateControlDecoration(Control control, Composite parent) {
 		Assert.isNotNull(control);
-		controlDecoration = new ControlDecoration(control, doGetControlDecorationPosition());
+		controlDecoration = new ControlDecoration(control, doGetControlDecorationPosition(), parent);
 		return controlDecoration;
 	}
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java
index e4746e622..e31511c1f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/BaseEditBrowseTextControl.java
@@ -1316,7 +1316,7 @@ public class BaseEditBrowseTextControl extends AbstractDecoratedDialogPageContro
 			// configured. Otherwise, the layout data for the edit field may
 			// not be configured correctly.
 			if (!isHideEditFieldControlDecoration()) {
-				ControlDecoration controlDecoration = doCreateControlDecoration(editFieldControl);
+				ControlDecoration controlDecoration = doCreateControlDecoration(editFieldControl, parent);
 				Assert.isNotNull(controlDecoration);
 				configureControlDecoration(controlDecoration);
 			}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/controls/AbstractContextSelectorControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/controls/AbstractContextSelectorControl.java
index 97dea24be..ad0ccdfe5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/controls/AbstractContextSelectorControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/controls/AbstractContextSelectorControl.java
@@ -612,7 +612,7 @@ public abstract class AbstractContextSelectorControl extends AbstractDecoratedDi
 				fireSelectionChanged();
 			}
 		});
-		doCreateControlDecoration(viewer.getTree());
+		doCreateControlDecoration(viewer.getTree(), viewer.getTree().getParent());
 	}
 
 	/**