diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
2 files changed, 15 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java index 5cf148225..56abb297c 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java @@ -65,6 +65,8 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.events.ControlEvent; +import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.PaintEvent; @@ -140,6 +142,7 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im editingDomainChange(null, getCompareConfiguration().getEditingDomain()); getCompareConfiguration().getEventBus().register(this); + } @Subscribe @@ -296,6 +299,16 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im fRight.addSelectionChangedListener(this); fColors = new EMFCompareColor(this, null, getCompareConfiguration()); + + composite.addControlListener(new ControlListener() { + public void controlResized(ControlEvent e) { + redrawCenterControl(); + } + + public void controlMoved(ControlEvent e) { + // Do nothing. + } + }); } /** diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java index 9f9deaf8c..247bd5f10 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java @@ -238,12 +238,12 @@ public class TableContentMergeViewer extends EMFCompareContentMergeViewer { return super.getColumnImage(object, columnIndex); } }); + ret.getStructuredViewer().getTable().getVerticalBar().addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { redrawCenterControl(); } }); - ret.getStructuredViewer().getTable().addMouseWheelListener(new MouseWheelListener() { public void mouseScrolled(MouseEvent e) { redrawCenterControl(); @@ -254,6 +254,7 @@ public class TableContentMergeViewer extends EMFCompareContentMergeViewer { redrawCenterControl(); } }); + return ret; } |