Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis Windatt2012-12-17 21:37:53 +0000
committerCurtis Windatt2012-12-17 21:37:53 +0000
commit928a7ca350ec82c36c90959c512ebe8d96299763 (patch)
treef1c8497ef664903225d9b177cd20ccc4659e5688
parentd9f5e6ea46e209760a42c2cf94c33493cfe8c2f6 (diff)
downloadeclipse.platform.debug-928a7ca350ec82c36c90959c512ebe8d96299763.tar.gz
eclipse.platform.debug-928a7ca350ec82c36c90959c512ebe8d96299763.tar.xz
eclipse.platform.debug-928a7ca350ec82c36c90959c512ebe8d96299763.zip
Bug 340790 - Breakpoint detail pane created twicev20121217-213753I20121218-0800
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java27
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java4
2 files changed, 16 insertions, 15 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
index fa315f82c..06b1b7c57 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
@@ -249,7 +249,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
/**
* Separator used when detail pane background colors of tree/detail pane are different.
*/
- private Label fSeperator;
+ private Label fSeparator;
/**
* Parent of the viewer, used to detect re-sizing for automatic layout
@@ -836,14 +836,14 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
fDetailsComposite = SWTFactory.createComposite(fDetailsAnchor, fDetailsAnchor.getFont(), 1, 1, GridData.FILL_BOTH, 0, 0);
GridLayout layout = (GridLayout) fDetailsComposite.getLayout();
layout.verticalSpacing = 0;
- fSeperator = new Label(fDetailsComposite, SWT.SEPARATOR| SWT.HORIZONTAL);
- fSeperator.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+ fSeparator = new Label(fDetailsComposite, SWT.SEPARATOR| SWT.HORIZONTAL);
+ fSeparator.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
} else {
fDetailsComposite = SWTFactory.createComposite(fDetailsAnchor, fDetailsAnchor.getFont(), 2, 1, GridData.FILL_BOTH, 0, 0);
GridLayout layout = (GridLayout) fDetailsComposite.getLayout();
layout.horizontalSpacing = 0;
- fSeperator= new Label(fDetailsComposite, SWT.SEPARATOR | SWT.VERTICAL);
- fSeperator.setLayoutData(new GridData(SWT.TOP, SWT.FILL, false, true));
+ fSeparator= new Label(fDetailsComposite, SWT.SEPARATOR | SWT.VERTICAL);
+ fSeparator.setLayoutData(new GridData(SWT.TOP, SWT.FILL, false, true));
}
// force update so detail pane can adapt to orientation change
showDetailPane();
@@ -1165,17 +1165,16 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
}
fDetailPane.display(getCurrentSelection());
- // Adjust sash background color settings and separator based on detail pane background color:
- // When the backgrounds are the same, the sash should have a default background, else it should be
- // invisible and the label separator should appear with the same background color as the detail pane
+ // Use a grey (widget background) sash for the detail pane normally
+ // If the detail pane is also grey, add a seperator line
Control control = fDetailPane.getCurrentControl();
- if (control.getBackground().equals(fDetailsAnchor.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND))) {
- fSeperator.setVisible(false);
- getDefaultControl().setBackground(fDetailsAnchor.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ if (control.getBackground().equals(fSashForm.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND))) {
+ fSashForm.setBackground(fSashForm.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ fSeparator.setVisible(true);
+ fSeparator.setBackground(control.getBackground());
} else {
- fSeperator.setVisible(true);
- getDefaultControl().setBackground(fDetailsAnchor.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
- fSeperator.setBackground(control.getBackground());
+ fSashForm.setBackground(fSashForm.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ fSeparator.setVisible(false);
}
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java
index 8fb621870..69fa18c3b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ import org.eclipse.debug.internal.ui.SWTFactory;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.IDetailPane;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -60,6 +61,7 @@ public class MessageDetailPane implements IDetailPane {
*/
public Control createControl(Composite parent) {
fControlParent = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH);
+ fControlParent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
fLabel = SWTFactory.createWrapLabel(fControlParent, "", 1); //$NON-NLS-1$
return fControlParent;
}

Back to the top