Fixed showTodayProperty() bindings.

dlsc-software-consulting-gmbh · Sep 15, 2022 · 0d040bb · 0d040bb
1 parent 07e4410
commit 0d040bb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/DayViewBase.java b/CalendarFXView/src/main/java/com/calendarfx/view/DayViewBase.java
@@ -72,8 +72,6 @@ public abstract class DayViewBase extends DateControl implements ZonedDateTimePr
      * Constructs a new view.
      */
     public DayViewBase() {
-        scrollingEnabledProperty().addListener(it -> Thread.dumpStack());
-
         MapChangeListener<? super Object, ? super Object> propertiesListener = change -> {
             if (change.wasAdded()) {
                 if (change.getKey().equals("show.current.time.marker")) {

diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/DetailedWeekView.java b/CalendarFXView/src/main/java/com/calendarfx/view/DetailedWeekView.java
@@ -73,29 +73,27 @@ public DetailedWeekView() {
     public DetailedWeekView(int numberOfDays) {
         setNumberOfDays(numberOfDays);
 
+
         getStyleClass().add(DEFAULT_STYLE_CLASS);
 
         calendarHeaderView = new CalendarHeaderView();
-        calendarHeaderView.numberOfDaysProperty().bind(numberOfDaysProperty());
+        calendarHeaderView.numberOfDaysProperty().bindBidirectional(numberOfDaysProperty());
         calendarHeaderView.bind(this);
 
         weekDayHeaderView = new WeekDayHeaderView();
-        weekDayHeaderView.showTodayProperty().bind(showTodayProperty());
+        weekDayHeaderView.showTodayProperty().bindBidirectional(showTodayProperty());
 
         bind(weekDayHeaderView, true);
         Bindings.bindBidirectional(weekDayHeaderView.numberOfDaysProperty(), numberOfDaysProperty());
         Bindings.bindBidirectional(weekDayHeaderView.adjustToFirstDayOfWeekProperty(), adjustToFirstDayOfWeekProperty());
 
         allDayView = new AllDayView(getNumberOfDays());
-        allDayView.showTodayProperty().bind(showTodayProperty());
 
         bind(allDayView, true);
         Bindings.bindBidirectional(allDayView.numberOfDaysProperty(), numberOfDaysProperty());
         Bindings.bindBidirectional(allDayView.adjustToFirstDayOfWeekProperty(), adjustToFirstDayOfWeekProperty());
 
         weekView = new WeekView();
-        weekView.showTodayProperty().bind(showTodayProperty());
-
         bind(weekView, true);
         Bindings.bindBidirectional(weekView.numberOfDaysProperty(), numberOfDaysProperty());
         Bindings.bindBidirectional(weekView.adjustToFirstDayOfWeekProperty(), adjustToFirstDayOfWeekProperty());

diff --git a/CalendarFXView/src/main/java/com/calendarfx/view/WeekView.java b/CalendarFXView/src/main/java/com/calendarfx/view/WeekView.java
@@ -76,6 +76,7 @@ public WeekView(int numberOfDays) {
 
         setWeekDayViewFactory(param -> new WeekDayView());
         setNumberOfDays(numberOfDays);
+        setShowToday(true);
 
         dateProperty().addListener(it -> updateStartAndEndDates());
 

diff --git a/CalendarFXView/src/main/java/impl/com/calendarfx/view/DetailedDayViewSkin.java b/CalendarFXView/src/main/java/impl/com/calendarfx/view/DetailedDayViewSkin.java
@@ -74,6 +74,7 @@ public DetailedDayViewSkin(DetailedDayView view) {
 
         // the all-day view
         allDayView = view.getAllDayView();
+        allDayView.showTodayProperty().unbindBidirectional(view.showTodayProperty());
         allDayView.setShowToday(false);
         allDayView.setAdjustToFirstDayOfWeek(false);
 

diff --git a/CalendarFXView/src/main/java/impl/com/calendarfx/view/page/DayPageSkin.java b/CalendarFXView/src/main/java/impl/com/calendarfx/view/page/DayPageSkin.java
@@ -202,7 +202,7 @@ protected Node createRightHandSide() {
         getSkinnable().bind(dayView, true);
 
         AllDayView allDayView = dayView.getAllDayView();
-        allDayView.showTodayProperty().unbind(); // we need control over this
+        allDayView.showTodayProperty().unbindBidirectional(dayView.showTodayProperty()); // we need control over this
 
         return dayView;
     }