Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilos Kleint2011-02-04 12:46:58 +0000
committerMilos Kleint2011-02-04 12:46:58 +0000
commit6ffb6d02ed09a918adb0c03857218f0a6415c749 (patch)
tree545e5b34578fb9aba14780df0b928b4c813a37b9 /org.eclipse.m2e.editor.xml
parent46a4d20ccb4c880b083b589bc55a45fed5824825 (diff)
downloadm2e-core-6ffb6d02ed09a918adb0c03857218f0a6415c749.tar.gz
m2e-core-6ffb6d02ed09a918adb0c03857218f0a6415c749.tar.xz
m2e-core-6ffb6d02ed09a918adb0c03857218f0a6415c749.zip
proper sizing for extreme width and height
Diffstat (limited to 'org.eclipse.m2e.editor.xml')
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/FormHoverProvider.java8
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java1
2 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/FormHoverProvider.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/FormHoverProvider.java
index 4c3fdf63..21627141 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/FormHoverProvider.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/FormHoverProvider.java
@@ -92,11 +92,13 @@ public final class FormHoverProvider {
}
}
};
- mhc.setInput(compound);
+
mhc.setLocation(new Point(position.x, position.y));
+ mhc.setSizeConstraints(400, 400);
+ mhc.setInput(compound);
Point hint = mhc.computeSizeHint();
- mhc.setSize(hint.x, hint.y);
- if (!fDisplay.getBounds().contains(position.x + hint.x, position.y + hint.y)) {
+ mhc.setSize(hint.x, Math.min(hint.y, 400));
+ if (!fDisplay.getBounds().contains(position.x + hint.x, position.y)) {
mhc.setLocation(new Point(position.x - (position.x + hint.x - fDisplay.getBounds().width), position.y));
}
// mhc.getMyShell().addShellListener(new ShellAdapter() {
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java
index 23377599..87ed2449 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerHoverControl.java
@@ -123,7 +123,6 @@ public class MarkerHoverControl extends AbstractInformationControl implements II
public void setFocus() {
super.setFocus();
if (focusControl != null) {
- System.out.println("setting focus to my comp");
focusControl.setFocus();
}
}

Back to the top