Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-03-01 00:04:43 +0000
committerAndre Weinand2004-03-01 00:04:43 +0000
commit1a85307a06b32264c8b33ab08befd924c92b2ddf (patch)
tree8cf8de9c91b96d288a88dbfca216084c51925326
parenta166977aaffd14f6661b328025c8b43abae36b84 (diff)
downloadeclipse.platform.team-1a85307a06b32264c8b33ab08befd924c92b2ddf.tar.gz
eclipse.platform.team-1a85307a06b32264c8b33ab08befd924c92b2ddf.tar.xz
eclipse.platform.team-1a85307a06b32264c8b33ab08befd924c92b2ddf.zip
fixed #53368
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html1
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java10
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java10
4 files changed, 8 insertions, 14 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 9206def21..655f1078f 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -17,6 +17,7 @@ Eclipse Build Input March 2th 2004
Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=42731">#42731</a>: Synchronize horizontal scrolling in compare editor<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=2278">#2278</a>: DCR: Would like coupled horizontal scrolling in compare browser (1GEJNHO)<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=53368">#53368</a>: Layout problem with focus ring<br>
<h1>
<hr WIDTH="100%"></h1>
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 c8b26cca0..afe0b5051 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
@@ -2030,9 +2030,7 @@ public class TextMergeViewer extends ContentMergeViewer {
width2-= BIRDS_EYE_VIEW_WIDTH;
Rectangle trim= fLeft.getTextWidget().computeTrim(0, 0, 0, 0);
- int scrollbarHeight= trim.height;
- if (fIsCarbon)
- scrollbarHeight-= 3; // get rid of the focus ring
+ int scrollbarHeight= trim.height + trim.x;
Composite composite= (Composite) getControl();
@@ -2062,10 +2060,8 @@ public class TextMergeViewer extends ContentMergeViewer {
int scrollbarWidth= 0;
if (fSynchronizedScrolling && fScrollCanvas != null) {
- //scrollbarWidth= fScrollCanvas.computeTrim(0, 0, 0, 0).width;
- scrollbarWidth= fLeft.getTextWidget().computeTrim(0, 0, 0, 0).width;
- if (fIsCarbon)
- scrollbarWidth-= 6; // get rid of the focus ring
+ trim= fLeft.getTextWidget().computeTrim(0, 0, 0, 0);
+ scrollbarWidth= trim.width + 2*trim.x;
}
int rightTextWidth= width2-scrollbarWidth;
if (fRightCanvas != null)
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index 9206def21..655f1078f 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -17,6 +17,7 @@ Eclipse Build Input March 2th 2004
Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=42731">#42731</a>: Synchronize horizontal scrolling in compare editor<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=2278">#2278</a>: DCR: Would like coupled horizontal scrolling in compare browser (1GEJNHO)<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=53368">#53368</a>: Layout problem with focus ring<br>
<h1>
<hr WIDTH="100%"></h1>
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 c8b26cca0..afe0b5051 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
@@ -2030,9 +2030,7 @@ public class TextMergeViewer extends ContentMergeViewer {
width2-= BIRDS_EYE_VIEW_WIDTH;
Rectangle trim= fLeft.getTextWidget().computeTrim(0, 0, 0, 0);
- int scrollbarHeight= trim.height;
- if (fIsCarbon)
- scrollbarHeight-= 3; // get rid of the focus ring
+ int scrollbarHeight= trim.height + trim.x;
Composite composite= (Composite) getControl();
@@ -2062,10 +2060,8 @@ public class TextMergeViewer extends ContentMergeViewer {
int scrollbarWidth= 0;
if (fSynchronizedScrolling && fScrollCanvas != null) {
- //scrollbarWidth= fScrollCanvas.computeTrim(0, 0, 0, 0).width;
- scrollbarWidth= fLeft.getTextWidget().computeTrim(0, 0, 0, 0).width;
- if (fIsCarbon)
- scrollbarWidth-= 6; // get rid of the focus ring
+ trim= fLeft.getTextWidget().computeTrim(0, 0, 0, 0);
+ scrollbarWidth= trim.width + 2*trim.x;
}
int rightTextWidth= width2-scrollbarWidth;
if (fRightCanvas != null)

Back to the top