Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-12-13 05:34:21 -0500
committerAndre Weinand2002-12-13 05:34:21 -0500
commit10934ac33f5f8f596ea4fe0b3d2a4ca79fffca3e (patch)
tree7310bf6f3e0e393ae3bbd415ab33e144fa4c3a78
parent16f300dd6a0d011f69f36dd2fd865849073a8027 (diff)
downloadeclipse.platform.team-10934ac33f5f8f596ea4fe0b3d2a4ca79fffca3e.tar.gz
eclipse.platform.team-10934ac33f5f8f596ea4fe0b3d2a4ca79fffca3e.tar.xz
eclipse.platform.team-10934ac33f5f8f596ea4fe0b3d2a4ca79fffca3e.zip
ui work
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java30
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java30
2 files changed, 32 insertions, 28 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 8a89bfdd2..68f040b3a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1254,20 +1254,19 @@ public class TextMergeViewer extends ContentMergeViewer {
}
}
);
- canvas.addMouseTrackListener(
- new MouseTrackAdapter() {
- public void mouseEnter(MouseEvent e) {
- System.out.println("enter");
- if (fCenterButton != null)
- fCenterButton.setVisible(false);
- }
- public void mouseExit(MouseEvent e) {
- System.out.println("exit");
- if (fCenterButton != null)
- fCenterButton.setVisible(false);
- }
- }
- );
+// canvas.addMouseTrackListener(
+// new MouseTrackAdapter() {
+// public void mouseEnter(MouseEvent e) {
+// System.out.println("enter");
+// if (fCenterButton != null)
+// fCenterButton.setVisible(false);
+// }
+// public void mouseExit(MouseEvent e) {
+// if (fCenterButton != null)
+// fCenterButton.setVisible(false);
+// }
+// }
+// );
fCenterButton= new Button(canvas, "carbon".equals(SWT.getPlatform()) ? SWT.FLAT : SWT.PUSH);
fCenterButton.setText("<");
@@ -3477,6 +3476,9 @@ public class TextMergeViewer extends ContentMergeViewer {
// if (d == fCurrentDiff)
// return;
+
+ if (fCenterButton != null)
+ fCenterButton.setVisible(false);
fEndOfDocReached= false;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 8a89bfdd2..68f040b3a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1254,20 +1254,19 @@ public class TextMergeViewer extends ContentMergeViewer {
}
}
);
- canvas.addMouseTrackListener(
- new MouseTrackAdapter() {
- public void mouseEnter(MouseEvent e) {
- System.out.println("enter");
- if (fCenterButton != null)
- fCenterButton.setVisible(false);
- }
- public void mouseExit(MouseEvent e) {
- System.out.println("exit");
- if (fCenterButton != null)
- fCenterButton.setVisible(false);
- }
- }
- );
+// canvas.addMouseTrackListener(
+// new MouseTrackAdapter() {
+// public void mouseEnter(MouseEvent e) {
+// System.out.println("enter");
+// if (fCenterButton != null)
+// fCenterButton.setVisible(false);
+// }
+// public void mouseExit(MouseEvent e) {
+// if (fCenterButton != null)
+// fCenterButton.setVisible(false);
+// }
+// }
+// );
fCenterButton= new Button(canvas, "carbon".equals(SWT.getPlatform()) ? SWT.FLAT : SWT.PUSH);
fCenterButton.setText("<");
@@ -3477,6 +3476,9 @@ public class TextMergeViewer extends ContentMergeViewer {
// if (d == fCurrentDiff)
// return;
+
+ if (fCenterButton != null)
+ fCenterButton.setVisible(false);
fEndOfDocReached= false;

Back to the top