Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-10-18 10:51:27 -0400
committerMikaƫl Barbero2013-10-20 04:20:35 -0400
commit39050ef8a43dcbbc046081a398b3702096183e6e (patch)
treed44289c95d1aba17e6cbbf6b809cbbcc343925be /plugins/org.eclipse.emf.compare.ide.ui/src
parent6ee5e109d8875ce63f456eebdbff6a2b979fed5c (diff)
downloadorg.eclipse.emf.compare-39050ef8a43dcbbc046081a398b3702096183e6e.tar.gz
org.eclipse.emf.compare-39050ef8a43dcbbc046081a398b3702096183e6e.tar.xz
org.eclipse.emf.compare-39050ef8a43dcbbc046081a398b3702096183e6e.zip
Fix redraw() not propagated under windows
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
index 76a2c105f..726f7f08a 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
@@ -410,7 +410,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
@Subscribe
public void mergePreviewModeChange(IMergePreviewModeChange event) {
dependencyData.updateDependencies(getSelection());
- getControl().redraw();
+ internalRedraw();
}
@Subscribe
@@ -775,14 +775,23 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
dependencyData.updateTreeItemMappings();
dependencyData.updateDependencies(getSelection());
- getControl().redraw();
+ internalRedraw();
refreshTitle();
}
private void handleSelectionChangedEvent(SelectionChangedEvent event) {
dependencyData.updateDependencies(event.getSelection());
- getControl().redraw();
+ internalRedraw();
+ }
+
+ /**
+ * We need to call redraw() on the tree and the tree ruler because getControl().redraw() doesn't propagate
+ * the redraw on its sub components under windows platform.
+ */
+ private void internalRedraw() {
+ getViewer().getTree().redraw();
+ treeRuler.redraw();
}
}

Back to the top