Attachment 93570 Details for Bug 223327 – Fix 3 - no margins, looks good on the Mac

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix 3 - no margins, looks good on the Mac

223934_Mac_noBorder_patch.txt (text/plain), 4.61 KB, created by Markus Keller

on 2008-03-26 07:56:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2008-03-26 07:56:15 EDT

Size: 4.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface.text
>Index: src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java,v
>retrieving revision 1.6
>diff -u -r1.6 MultipleHyperlinkPresenter.java
>--- src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java	20 Mar 2008 11:45:26 -0000	1.6
>+++ src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java	26 Mar 2008 11:46:52 -0000
>@@ -10,6 +10,28 @@
>  *******************************************************************************/
> package org.eclipse.jface.text.hyperlink;
> 
>+import org.eclipse.jface.preference.IPreferenceStore;
>+import org.eclipse.jface.text.AbstractInformationControl;
>+import org.eclipse.jface.text.AbstractInformationControlManager;
>+import org.eclipse.jface.text.IInformationControl;
>+import org.eclipse.jface.text.IInformationControlCreator;
>+import org.eclipse.jface.text.IInformationControlExtension2;
>+import org.eclipse.jface.text.IInformationControlExtension3;
>+import org.eclipse.jface.text.IRegion;
>+import org.eclipse.jface.text.ITextHover;
>+import org.eclipse.jface.text.ITextHoverExtension;
>+import org.eclipse.jface.text.ITextViewer;
>+import org.eclipse.jface.text.IWidgetTokenKeeper;
>+import org.eclipse.jface.text.IWidgetTokenKeeperExtension;
>+import org.eclipse.jface.text.IWidgetTokenOwner;
>+import org.eclipse.jface.text.IWidgetTokenOwnerExtension;
>+import org.eclipse.jface.text.JFaceTextUtil;
>+import org.eclipse.jface.text.Region;
>+import org.eclipse.jface.util.Geometry;
>+import org.eclipse.jface.viewers.ColumnLabelProvider;
>+import org.eclipse.jface.viewers.IStructuredContentProvider;
>+import org.eclipse.jface.viewers.TableViewer;
>+import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.KeyAdapter;
> import org.eclipse.swt.events.KeyEvent;
>@@ -25,7 +47,6 @@
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.graphics.RGB;
> import org.eclipse.swt.graphics.Rectangle;
>-import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Display;
>@@ -35,30 +56,6 @@
> import org.eclipse.swt.widgets.Table;
> import org.eclipse.swt.widgets.TableItem;
> 
>-import org.eclipse.jface.preference.IPreferenceStore;
>-import org.eclipse.jface.util.Geometry;
>-import org.eclipse.jface.viewers.ColumnLabelProvider;
>-import org.eclipse.jface.viewers.IStructuredContentProvider;
>-import org.eclipse.jface.viewers.TableViewer;
>-import org.eclipse.jface.viewers.Viewer;
>-
>-import org.eclipse.jface.text.AbstractInformationControl;
>-import org.eclipse.jface.text.AbstractInformationControlManager;
>-import org.eclipse.jface.text.IInformationControl;
>-import org.eclipse.jface.text.IInformationControlCreator;
>-import org.eclipse.jface.text.IInformationControlExtension2;
>-import org.eclipse.jface.text.IInformationControlExtension3;
>-import org.eclipse.jface.text.IRegion;
>-import org.eclipse.jface.text.ITextHover;
>-import org.eclipse.jface.text.ITextHoverExtension;
>-import org.eclipse.jface.text.ITextViewer;
>-import org.eclipse.jface.text.IWidgetTokenKeeper;
>-import org.eclipse.jface.text.IWidgetTokenKeeperExtension;
>-import org.eclipse.jface.text.IWidgetTokenOwner;
>-import org.eclipse.jface.text.IWidgetTokenOwnerExtension;
>-import org.eclipse.jface.text.JFaceTextUtil;
>-import org.eclipse.jface.text.Region;
>-
> 
> /**
>  * A hyperlink presenter capable of showing multiple hyperlinks in a hover.
>@@ -153,10 +150,6 @@
> 		 */
> 		protected void createContent(Composite parent) {
> 			fParent= parent;
>-			GridLayout layout= new GridLayout();
>-			layout.marginWidth= 0;
>-			layout.marginRight= 4;
>-			fParent.setLayout(layout);
> 			fParent.setForeground(fForegroundColor);
> 			fParent.setBackground(fBackgroundColor);
> 		}
>@@ -178,15 +171,17 @@
> 			int scrollBarHeight= fTable.getHorizontalBar().getSize().y;
> 			
> 			int width;
>-			if (preferedSize.y - scrollBarHeight < constraints.y) {
>+			if (preferedSize.y - scrollBarHeight <= constraints.y) {
> 				width= preferedSize.x - scrollBarWidth;
>+				fTable.getVerticalBar().setVisible(false);
> 			} else {
> 				width= Math.min(preferedSize.x, constraints.x);
> 			}
> 			
> 			int height;
>-			if (preferedSize.x - scrollBarWidth < constraints.x) {
>-				height= preferedSize.y - scrollBarHeight;
>+			if (preferedSize.x - scrollBarWidth <= constraints.x) {
>+				height= preferedSize.y - scrollBarHeight - 1;
>+				fTable.getHorizontalBar().setVisible(false);
> 			} else {
> 				height= Math.min(preferedSize.y, constraints.y);
> 			}

Actions: View | Diff

Attachments on bug 223327: 93011 | 93553 | 93565 | 93570 | 93607 | 93608