mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-11 10:15:39 +02:00
Bug 175144, expanding one item in CView can expand others.
This commit is contained in:
parent
8d597138b3
commit
b3a55927df
1 changed files with 1 additions and 31 deletions
|
@ -9,6 +9,7 @@
|
||||||
* QNX Software Systems - Initial API and implementation
|
* QNX Software Systems - Initial API and implementation
|
||||||
* Markus Schorn (Wind River Systems)
|
* Markus Schorn (Wind River Systems)
|
||||||
* Anton Leherbauer (Wind River Systems) - Fix bug 150045
|
* Anton Leherbauer (Wind River Systems) - Fix bug 150045
|
||||||
|
* Ken Ryall (Nokia) - Fix bug 175144
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.cdt.internal.ui.cview;
|
package org.eclipse.cdt.internal.ui.cview;
|
||||||
|
|
||||||
|
@ -35,11 +36,9 @@ import org.eclipse.jface.viewers.ISelection;
|
||||||
import org.eclipse.jface.viewers.ISelectionChangedListener;
|
import org.eclipse.jface.viewers.ISelectionChangedListener;
|
||||||
import org.eclipse.jface.viewers.ISelectionProvider;
|
import org.eclipse.jface.viewers.ISelectionProvider;
|
||||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||||
import org.eclipse.jface.viewers.ITreeViewerListener;
|
|
||||||
import org.eclipse.jface.viewers.OpenEvent;
|
import org.eclipse.jface.viewers.OpenEvent;
|
||||||
import org.eclipse.jface.viewers.SelectionChangedEvent;
|
import org.eclipse.jface.viewers.SelectionChangedEvent;
|
||||||
import org.eclipse.jface.viewers.StructuredSelection;
|
import org.eclipse.jface.viewers.StructuredSelection;
|
||||||
import org.eclipse.jface.viewers.TreeExpansionEvent;
|
|
||||||
import org.eclipse.jface.viewers.TreeViewer;
|
import org.eclipse.jface.viewers.TreeViewer;
|
||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.dnd.DND;
|
import org.eclipse.swt.dnd.DND;
|
||||||
|
@ -217,30 +216,6 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private ITreeViewerListener expansionListener = new ITreeViewerListener() {
|
|
||||||
|
|
||||||
public void treeCollapsed(TreeExpansionEvent event) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public void treeExpanded(TreeExpansionEvent event) {
|
|
||||||
final Object element = event.getElement();
|
|
||||||
if (element instanceof IParent) {
|
|
||||||
//viewer.refresh (element);
|
|
||||||
Control ctrl = viewer.getControl();
|
|
||||||
if (ctrl != null && !ctrl.isDisposed()) {
|
|
||||||
ctrl.getDisplay().asyncExec(new Runnable() {
|
|
||||||
|
|
||||||
public void run() {
|
|
||||||
Control ctrl = viewer.getControl();
|
|
||||||
if (ctrl != null && !ctrl.isDisposed()) {
|
|
||||||
viewer.expandToLevel(element, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
private IContextActivation fContextActivation;
|
private IContextActivation fContextActivation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -556,8 +531,6 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
|
||||||
IWorkingSetManager wsmanager = getViewSite().getWorkbenchWindow().getWorkbench().getWorkingSetManager();
|
IWorkingSetManager wsmanager = getViewSite().getWorkbenchWindow().getWorkbench().getWorkingSetManager();
|
||||||
wsmanager.addPropertyChangeListener(workingSetListener);
|
wsmanager.addPropertyChangeListener(workingSetListener);
|
||||||
|
|
||||||
viewer.addTreeListener(expansionListener);
|
|
||||||
|
|
||||||
// Needs to be done before the actions
|
// Needs to be done before the actions
|
||||||
getSite().setSelectionProvider(viewer);
|
getSite().setSelectionProvider(viewer);
|
||||||
getSite().getPage().addPartListener(partListener);
|
getSite().getPage().addPartListener(partListener);
|
||||||
|
@ -614,9 +587,6 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
|
||||||
|
|
||||||
getSite().getPage().removePartListener(partListener);
|
getSite().getPage().removePartListener(partListener);
|
||||||
CUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
|
CUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
|
||||||
if (viewer != null) {
|
|
||||||
viewer.removeTreeListener(expansionListener);
|
|
||||||
}
|
|
||||||
if (getActionGroup() != null) {
|
if (getActionGroup() != null) {
|
||||||
getActionGroup().dispose();
|
getActionGroup().dispose();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue