From 526c2965e17082bb61b3371157b14ba14ed44881 Mon Sep 17 00:00:00 2001 From: Markus Kreth Date: Tue, 7 Aug 2018 23:07:36 +0200 Subject: [PATCH] fixed ui handling for detail view --- .../vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java | 9 ++------- .../vaadinclubhelper/ui/components/PersonGrid.java | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java index d6d93e6..d02bc4a 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java @@ -65,8 +65,7 @@ public class MainUi extends UI { contentLayout = new HorizontalLayout(); contentLayout.setSizeFull(); contentLayout.addComponents(calendar); - contentLayout.setExpandRatio(calendar, 1.0f); - + setContent(contentLayout); setSizeFull(); @@ -88,8 +87,6 @@ public class MainUi extends UI { private void detailClosed() { LOGGER.debug("Closing detail view."); contentLayout.removeComponent(personGrid); - calendar.setSizeFull(); - contentLayout.setExpandRatio(calendar, 1.0f); } private void onItemClick(CalendarComponentEvents.ItemClickEvent event) { @@ -100,12 +97,10 @@ public class MainUi extends UI { private void showDetails(ClubEvent ev) { LOGGER.debug("Opening detail view for {}", ev); - contentLayout.setExpandRatio(calendar, .5f); - calendar.setWidth("50%"); - contentLayout.addComponent(personGrid); personGrid.setCaption(ev.getCaption()); personGrid.setTitle(ev.getCaption()); + personGrid.setVisible(true); } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java index 6b3ea36..bdba620 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java @@ -51,6 +51,7 @@ public class PersonGrid extends CustomComponent { textTitle.setStyleName("title_label"); textTitle.setCaption("Veranstaltung"); textTitle.setEnabled(false); + textTitle.setSizeFull(); checkIncluded = new CheckBox("Nur gemeldete"); checkIncluded.addValueChangeListener(ev -> onSelectedOnly(ev));