Merge branch 'spectator'

This commit is contained in:
Lennart Hensler committed 2012-02-13 14:24:19 +01:00
commit acb89fa2f9
3 files changed
+21 -2

No files matched your search

@@ -15,7 +15,6 @@ public class LeaderboardGroupImpl implements LeaderboardGroup {
public LeaderboardGroupImpl(String name, String description, List<Leaderboard> leaderboards) {
this.name = name;
this.description = description;
// this.leaderboards = new ArrayList<Leaderboard>(leaderboards);
this.leaderboards = leaderboards;
}
@@ -176,5 +176,6 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
RootPanel.get().add(logoAndTitlePanel); // position:fixed
RootPanel.get().add(timelinePanel); // position:fixed
//RootPanel.get().add(footerShadowPanel); // position:fixed
raceBoardPanel.setScrollOffset(logoAndTitlePanel.getOffsetHeight());
}
}
@@ -62,6 +62,11 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
* Updated upon each {@link #fillEvents(List)}
*/
private final Map<RaceIdentifier, RaceDTO> racesByIdentifier;
/**
* The offset when scrolling with the menu entry anchors (in the top right corner).
*/
private int scrollOffset;
private final List<CollapsableComponentViewer<?>> collapsableViewers;
private final FlowPanel componentsNavigationPanel;
@@ -74,6 +79,7 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
String leaderboardGroupName, ErrorReporter errorReporter, final StringMessages stringMessages, UserAgentTypes userAgentType) {
this.sailingService = sailingService;
this.raceSelectionProvider = raceSelectionProvider;
this.scrollOffset = 0;
raceSelectionProvider.addRaceSelectionChangeListener(this);
racesByIdentifier = new HashMap<RaceIdentifier, RaceDTO>();
RaceIdentifier selectedRaceIdentifier = raceSelectionProvider.getSelectedRaces().iterator().next();
@@ -147,7 +153,7 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
menuEntry.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
c.getViewerWidget().getElement().scrollIntoView();
Window.scrollTo(Window.getScrollLeft(), c.getViewerWidget().getAbsoluteTop() - scrollOffset);
}
});
componentsNavigationPanel.add(menuEntry);
@@ -180,6 +186,19 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
protected ErrorReporter getErrorReporter() {
return errorReporter;
}
public int getScrollOffset() {
return scrollOffset;
}
/**
* Sets the offset, when scrolling with the menu entry anchors (in the top right corner).<br />
* Only the absolute value of <code>scrollOffset</code> will be used.
* @param scrollOffset The new scrolling offset. <b>Only</b> the absolute value will be used.
*/
public void setScrollOffset(int scrollOffset) {
this.scrollOffset = Math.abs(scrollOffset);
}
@Override
public void fillEvents(List<EventDTO> events) {