0004943: Fixed issues caused by addAndExpand()

JumpMind · Aug 10, 2021 · 62160fb · 62160fb
1 parent 4eb020b
commit 62160fb
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ConfirmDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ConfirmDialog.java
@@ -51,7 +51,6 @@ public ConfirmDialog(String caption, String text, final IConfirmListener confirm
 
         VerticalLayout layout = new VerticalLayout();
         layout.setWidthFull();
-        layout.setHeight("90%");
         layout.setSpacing(true);
         layout.setMargin(false);
         add(layout);
@@ -64,11 +63,11 @@ public ConfirmDialog(String caption, String text, final IConfirmListener confirm
             textLabel.setReadOnly(true);
             layout.addAndExpand(textLabel);
         }
+        layout.setHeight("90%");
 
         HorizontalLayout buttonLayout = new HorizontalLayout();
         //buttonLayout.setClassName(ValoTheme.WINDOW_BOTTOM_TOOLBAR);
         buttonLayout.setSpacing(true);
-        buttonLayout.setWidthFull();
 
         buttonLayout.addAndExpand(new Span());
 

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
@@ -62,7 +62,8 @@ public NotifyDialog(String caption, String text, final Throwable ex, Notificatio
         final Label textLabel = new Label(message);
         messageArea.addAndExpand(textLabel);
 
-        content.addAndExpand(messageArea);
+        content.add(messageArea);
+        content.expand(messageArea);
 
         final Button detailsButton = new Button("Details");
         detailsButton.setVisible(ex != null);

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/PromptDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/PromptDialog.java
@@ -74,7 +74,6 @@ public PromptDialog(String caption, String text, String defaultValue,
         HorizontalLayout buttonLayout = new HorizontalLayout();
         //buttonLayout.addClassName(ValoTheme.WINDOW_BOTTOM_TOOLBAR);
         buttonLayout.setSpacing(true);
-        buttonLayout.setWidthFull();
 
         buttonLayout.addAndExpand(new Span());
 

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
@@ -58,7 +58,7 @@ public ResizableDialog(String caption) {
 
         content = new VerticalLayout();
         content.setWidthFull();
-        content.setHeight("94%");
+        content.setHeight("92%");
         content.setMargin(false);
         content.setSpacing(false);
         super.add(content);
@@ -106,7 +106,6 @@ protected HorizontalLayout buildButtonFooter(Component... toTheRightButtons) {
     protected HorizontalLayout buildButtonFooter(Component[] toTheLeftButtons, Component... toTheRightButtons) {
         HorizontalLayout footer = new HorizontalLayout();
 
-        footer.setWidth("100%");
         footer.setSpacing(true);
         //footer.addClassName(ValoTheme.WINDOW_BOTTOM_TOOLBAR);
 

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TableInfoPanel.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TableInfoPanel.java
@@ -219,7 +219,8 @@ protected void populate(VerticalLayout layout) {
         Grid<List<Object>> grid = creator.create(columnVisibilityToggler);
         layout.add(columnVisibilityToggler);
         layout.setHorizontalComponentAlignment(Alignment.END, columnVisibilityToggler);
-        layout.addAndExpand(grid);
+        layout.add(grid);
+        layout.expand(grid);
         ComponentUtil.setData(layout, "creator", null);
     }
 

diff --git a/...ic-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TableSelectionLayout.java b/...ic-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TableSelectionLayout.java
@@ -100,7 +100,6 @@ protected void createTableSelectionLayout(String titleKey) {
         this.add(new Span(titleKey));
 
         HorizontalLayout schemaChooserLayout = new HorizontalLayout();
-        schemaChooserLayout.setWidthFull();
         schemaChooserLayout.setSpacing(true);
         this.add(schemaChooserLayout);
 

diff --git a/...ric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TabularResultLayout.java b/...ric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TabularResultLayout.java
@@ -342,7 +342,6 @@ protected void createTabularResultLayout() {
 
     private void createMenuBar() {
         HorizontalLayout resultBar = new HorizontalLayout();
-        resultBar.setWidthFull();
         resultBar.getStyle().set("margin", "0 16px");
 
         HorizontalLayout leftBar = new HorizontalLayout();

diff --git a/...tric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TriggerTableLayout.java b/...tric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TriggerTableLayout.java
@@ -61,7 +61,6 @@ public void createTabularLayout() {
         this.setSpacing(false);
 
         HorizontalLayout bar = new HorizontalLayout();
-        bar.setWidthFull();
         bar.getStyle().set("margin", "0 16px");
 
         HorizontalLayout leftBar = new HorizontalLayout();