0004943: Various visual tweaks

JumpMind · Aug 20, 2021 · 39f2628 · 39f2628
1 parent 34001f9
commit 39f2628
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/CommonUiUtils.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/CommonUiUtils.java
@@ -147,14 +147,16 @@ public static void notify(String caption, String message, Throwable ex, Notifica
         Page page = UI.getCurrent().getPage();
         if (page != null) {
             HorizontalLayout layout = new HorizontalLayout();
+            layout.setWidth("400px");
             Notification notification = new Notification(layout);
 
             Label label = new Label(caption + "\n" + contactWithLineFeed(FormatUtils.wordWrap(message, 150)));
             layout.add(label);
             layout.setVerticalComponentAlignment(Alignment.CENTER, label);
 
             Icon closeIcon = new Icon(VaadinIcon.CLOSE_CIRCLE_O);
-            closeIcon.setSize("8ex");
+            closeIcon.setSize("36px");
+            closeIcon.getStyle().set("min-width", "36px");
             closeIcon.addClickListener(event -> notification.close());
             closeIcon.addClickShortcut(Key.ESCAPE);
             layout.add(closeIcon);

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/NotifyDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/NotifyDialog.java
@@ -25,10 +25,9 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.Scroller;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.notification.NotificationVariant;
-import com.vaadin.flow.component.UI;
 
 public class NotifyDialog extends ResizableDialog {
 
@@ -43,24 +42,23 @@ public NotifyDialog(String text, Throwable ex) {
     public NotifyDialog(String caption, String text, final Throwable ex, NotificationVariant type) {
         super(caption);
         setWidth("400px");
-        setHeight("300px");
+        setHeight("320px");
+
+        content.setHeight("86%");
 
-        final HorizontalLayout messageArea = new HorizontalLayout();
-        messageArea.addClassName("v-scrollable");
-        messageArea.setMargin(true);
-        messageArea.setSpacing(true);
+        final Scroller messageArea = new Scroller();
         messageArea.setSizeFull();
 
         text = isNotBlank(text) ? text : (ex != null ? ex.getMessage()
                 : "");
         if (type == NotificationVariant.LUMO_ERROR) {
-            //setIcon(VaadinIcon.BAN);
+            captionLabel.setLeftIcon(VaadinIcon.BAN);
         }
 
         final String message = text;
 
         final Label textLabel = new Label(message);
-        messageArea.addAndExpand(textLabel);
+        messageArea.setContent(textLabel);
 
         content.add(messageArea);
         content.expand(messageArea);
@@ -80,9 +78,8 @@ public NotifyDialog(String caption, String text, final Throwable ex, Notificatio
             } else {
                 textLabel.setText(message);
                 detailsButton.setText("Details");
-                messageArea.setMargin(true);
                 setWidth("400px");
-                setHeight("300px");
+                setHeight("320px");
             }
         });
 

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ResizableDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ResizableDialog.java
@@ -43,6 +43,8 @@ public class ResizableDialog extends Dialog {
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
     protected VerticalLayout content;
+
+    protected Label captionLabel;
 
     public ResizableDialog() {
         this("");
@@ -53,7 +55,8 @@ public ResizableDialog(String caption) {
         setResizable(true);
 
         if (caption != null) {
-            super.add(new Label(caption + "<hr>"));
+            captionLabel = new Label(caption + "<hr>");
+            super.add(captionLabel);
         }
 
         content = new VerticalLayout();