From b97eb9bca73bb667a8b1fc903aff0284ef2a760a Mon Sep 17 00:00:00 2001 From: it14083 Date: Tue, 2 Apr 2019 17:54:58 +0200 Subject: [PATCH] Do not cut off bottom of the bubble. --- addon/pom.xml | 2 +- .../contexthelp/widgetset/client/ui/VContextHelp.java | 6 +++++- demo/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addon/pom.xml b/addon/pom.xml index 3bb2e5b..b109b13 100644 --- a/addon/pom.xml +++ b/addon/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.vaadin.jonatan contexthelp - 3.0.0 + 3.0.1-SNAPSHOT ContextHelp jar diff --git a/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java b/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java index 7424472..9d62ecf 100644 --- a/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java +++ b/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java @@ -403,7 +403,11 @@ public int getTop(Placement placement) { switch (placement) { case RIGHT: case LEFT: - return helpElement.getAbsoluteTop() + helpElement.getOffsetHeight() / 2 - bubble.getOffsetHeight() / 2; + int top = helpElement.getAbsoluteTop() + helpElement.getOffsetHeight() / 2 - bubble.getOffsetHeight() / 2; + if(top + bubble.getOffsetHeight() > Document.get().getClientHeight()) { + top = Document.get().getClientHeight() - bubble.getOffsetHeight(); + } + return top; case ABOVE: return helpElement.getAbsoluteTop() - bubble.getOffsetHeight(); case BELOW: diff --git a/demo/pom.xml b/demo/pom.xml index c0a45a2..a3c4d39 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -277,7 +277,7 @@ org.vaadin.jonatan contexthelp - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3a6e8c9..4c62153 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.vaadin.jonatan contexthelp-modules pom - 3.0.0 + 3.0.1-SNAPSHOT ContextHelp Modules