Attachment 247091 Details for Bug 426012 – WIP

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

[patch] WIP

Bug 426012 Resize Content Assist.patch (text/plain), 2.97 KB, created by Curtis Windatt

on 2014-09-15 17:04:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2014-09-15 17:04:52 EDT

Size: 2.97 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>index 121e443..0de2883 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>@@ -1324,11 +1324,37 @@
> 			var document = this.parentNode.ownerDocument;
> 			var viewportWidth = document.documentElement.clientWidth,
> 			    viewportHeight =  document.documentElement.clientHeight;
>-			if (caretLocation.y + this.parentNode.offsetHeight > viewportHeight) {
>-				this.parentNode.style.top = (caretLocation.y - this.parentNode.offsetHeight - this.textView.getLineHeight()) + "px"; //$NON-NLS-0$
>+			    
>+			var spaceBelow = viewportHeight - caretLocation.y;			    
>+			if (this.parentNode.offsetHeight > spaceBelow) {
>+				// Check if div is too large to fit above
>+				var spaceAbove = caretLocation.y - this.textView.getLineHeight();
>+				if (this.parentNode.offsetHeight > spaceAbove){
>+					// Squeeze the div into the larger area
>+					if (spaceBelow > spaceAbove) {
>+						this.parentNode.style.maxHeight = spaceBelow + "px"; //$NON-NLS-0$
>+					} else {
>+						this.parentNode.style.maxHeight = spaceAbove + "px"; //$NON-NLS-0$
>+						this.parentNode.style.top = "0"; //$NON-NLS-0$
>+					}
>+				} else {
>+					// Put the div above the line
>+					this.parentNode.style.top = (caretLocation.y - this.parentNode.offsetHeight - this.textView.getLineHeight()) + "px"; //$NON-NLS-0$
>+					this.parentNode.style.maxHeight = spaceAbove + "px"; //$NON-NLS-0$
>+				}
>+			} else {
>+				this.parentNode.style.maxHeight = spaceBelow + "px"; //$NON-NLS-0$
> 			}
>+			
> 			if (caretLocation.x + this.parentNode.offsetWidth > viewportWidth) {
>-				this.parentNode.style.left = (viewportWidth - this.parentNode.offsetWidth) + "px"; //$NON-NLS-0$
>+				var leftSide = viewportWidth - this.parentNode.offsetWidth;
>+				if (leftSide < 0) {
>+					leftSide = 0;
>+				}
>+				this.parentNode.style.left = leftSide + "px"; //$NON-NLS-0$
>+				this.parentNode.style.maxWidth = viewportWidth - leftSide;
>+			} else {
>+				this.parentNode.style.maxWidth = viewportWidth + caretLocation.x + "px"; //$NON-NLS-0$
> 			}
> 		},
> 		_removeCloneNode: function(){
>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentassist.css b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentassist.css
>index 70473e1..3f62c29 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentassist.css
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentassist.css
>@@ -8,13 +8,14 @@
> 	z-index:100;
> 	cursor: default;
> 	min-width: 70px;
>-	max-width: 350px;
>-	max-height: 170px;
>+	width: 350px;
>+	height: 170px;
> 	overflow: hidden;
> 	white-space: nowrap;
> 	border-radius: 5px;
> 	box-shadow: rgba(0, 0, 0, 0.3) 2px 2px 10px;
> 	line-height: 18px;
>+	resize: both;
> }
> 
> .contentassist:focus {

Actions: View | Diff

Attachments on bug 426012: 247091