Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-12-13 06:52:49 -0500
committerAndre Weinand2002-12-13 06:52:49 -0500
commit25b7e8e4ca915dcfd8647df1f9468c4422c34acb (patch)
treeda8df93ac2e2a534c743714d513ef47805875a3d
parent0bd7bea3e2bb8f518816ea1641d20ecf5b98378f (diff)
downloadeclipse.platform.team-25b7e8e4ca915dcfd8647df1f9468c4422c34acb.tar.gz
eclipse.platform.team-25b7e8e4ca915dcfd8647df1f9468c4422c34acb.tar.xz
eclipse.platform.team-25b7e8e4ca915dcfd8647df1f9468c4422c34acb.zip
ui work
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java8
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java8
2 files changed, 10 insertions, 6 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 6234a8767..34e9815b7 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
@@ -1202,13 +1202,14 @@ public class TextMergeViewer extends ContentMergeViewer {
paintCenter(this, gc);
}
};
- if (!showResolveUI()) {
+ if (!fUseResolveUI) {
new Resizer(canvas, HORIZONTAL);
} else {
canvas.addMouseMoveListener(
new MouseMoveListener() {
public void mouseMove(MouseEvent e) {
- handleMouseMoveOverCenter(canvas, e.x, e.y);
+ if (showResolveUI())
+ handleMouseMoveOverCenter(canvas, e.x, e.y);
}
}
);
@@ -2971,7 +2972,8 @@ public class TextMergeViewer extends ContentMergeViewer {
// we only enable the new resolve ui if exactly one side is editable
boolean l= cc.isLeftEditable();
boolean r= cc.isRightEditable();
- return (l && !r) || (r && !l);
+ //return (l && !r) || (r && !l);
+ return l || r;
}
private void paintCenter(Canvas canvas, GC g) {
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 6234a8767..34e9815b7 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
@@ -1202,13 +1202,14 @@ public class TextMergeViewer extends ContentMergeViewer {
paintCenter(this, gc);
}
};
- if (!showResolveUI()) {
+ if (!fUseResolveUI) {
new Resizer(canvas, HORIZONTAL);
} else {
canvas.addMouseMoveListener(
new MouseMoveListener() {
public void mouseMove(MouseEvent e) {
- handleMouseMoveOverCenter(canvas, e.x, e.y);
+ if (showResolveUI())
+ handleMouseMoveOverCenter(canvas, e.x, e.y);
}
}
);
@@ -2971,7 +2972,8 @@ public class TextMergeViewer extends ContentMergeViewer {
// we only enable the new resolve ui if exactly one side is editable
boolean l= cc.isLeftEditable();
boolean r= cc.isRightEditable();
- return (l && !r) || (r && !l);
+ //return (l && !r) || (r && !l);
+ return l || r;
}
private void paintCenter(Canvas canvas, GC g) {

Back to the top