fixed ui handling for detail view

master
Markus Kreth 7 years ago
parent 1c1213d4f8
commit 526c2965e1
  1. 9
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java
  2. 1
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java

@ -65,8 +65,7 @@ public class MainUi extends UI {
contentLayout = new HorizontalLayout(); contentLayout = new HorizontalLayout();
contentLayout.setSizeFull(); contentLayout.setSizeFull();
contentLayout.addComponents(calendar); contentLayout.addComponents(calendar);
contentLayout.setExpandRatio(calendar, 1.0f);
setContent(contentLayout); setContent(contentLayout);
setSizeFull(); setSizeFull();
@ -88,8 +87,6 @@ public class MainUi extends UI {
private void detailClosed() { private void detailClosed() {
LOGGER.debug("Closing detail view."); LOGGER.debug("Closing detail view.");
contentLayout.removeComponent(personGrid); contentLayout.removeComponent(personGrid);
calendar.setSizeFull();
contentLayout.setExpandRatio(calendar, 1.0f);
} }
private void onItemClick(CalendarComponentEvents.ItemClickEvent event) { private void onItemClick(CalendarComponentEvents.ItemClickEvent event) {
@ -100,12 +97,10 @@ public class MainUi extends UI {
private void showDetails(ClubEvent ev) { private void showDetails(ClubEvent ev) {
LOGGER.debug("Opening detail view for {}", ev); LOGGER.debug("Opening detail view for {}", ev);
contentLayout.setExpandRatio(calendar, .5f);
calendar.setWidth("50%");
contentLayout.addComponent(personGrid); contentLayout.addComponent(personGrid);
personGrid.setCaption(ev.getCaption()); personGrid.setCaption(ev.getCaption());
personGrid.setTitle(ev.getCaption()); personGrid.setTitle(ev.getCaption());
personGrid.setVisible(true);
} }

@ -51,6 +51,7 @@ public class PersonGrid extends CustomComponent {
textTitle.setStyleName("title_label"); textTitle.setStyleName("title_label");
textTitle.setCaption("Veranstaltung"); textTitle.setCaption("Veranstaltung");
textTitle.setEnabled(false); textTitle.setEnabled(false);
textTitle.setSizeFull();
checkIncluded = new CheckBox("Nur gemeldete"); checkIncluded = new CheckBox("Nur gemeldete");
checkIncluded.addValueChangeListener(ev -> onSelectedOnly(ev)); checkIncluded.addValueChangeListener(ev -> onSelectedOnly(ev));

Loading…
Cancel
Save