tablet/atlantafx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose DatePicker looked-up color variables

Browse Source 
Also add example of dynamic date picker color changing
This commit is contained in:
mkpaz 2022-09-05 14:33:15 +04:00
parent 0f3b2d4aac
commit 2990b52033
3 changed files with 157 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
sampler/src/main/java/atlantafx/sampler/page/components/DatePickerPage.java
View File

@ -9,18 +9,23 @@ import atlantafx.sampler.page.AbstractPage;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.DateCell; import javafx.scene.control.DateCell;
import javafx.scene.control.DatePicker; import javafx.scene.control.DatePicker;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.GridPane; import javafx.scene.layout.*;
import javafx.scene.layout.VBox;
import javafx.util.Callback; import javafx.util.Callback;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import org.kordamp.ikonli.javafx.FontIcon;
import org.kordamp.ikonli.material2.Material2AL;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.chrono.HijrahChronology; import java.time.chrono.HijrahChronology;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import static atlantafx.base.theme.Styles.BUTTON_ICON;
import static atlantafx.base.theme.Styles.FLAT;
import static javafx.scene.layout.GridPane.REMAINING; import static javafx.scene.layout.GridPane.REMAINING;
public class DatePickerPage extends AbstractPage { public class DatePickerPage extends AbstractPage {
@ -104,7 +109,10 @@ public class DatePickerPage extends AbstractPage {
); );
controls.setAlignment(Pos.CENTER_RIGHT); controls.setAlignment(Pos.CENTER_RIGHT);
var colorSelector = new DatePickerColorSelector(playground);
// == GRID == // == GRID ==
var defaultLabel = new Label("Default"); var defaultLabel = new Label("Default");
defaultLabel.getStyleClass().add(Styles.TEXT_BOLD); defaultLabel.getStyleClass().add(Styles.TEXT_BOLD);
@ -117,6 +125,7 @@ public class DatePickerPage extends AbstractPage {
playground.add(inlineLabel, 0, 3); playground.add(inlineLabel, 0, 3);
playground.add(inlineDatePicker, INLINE_DATE_PICKER_COL, INLINE_DATE_PICKER_ROW); playground.add(inlineDatePicker, INLINE_DATE_PICKER_COL, INLINE_DATE_PICKER_ROW);
playground.add(inlineValue, 0, 5); playground.add(inlineValue, 0, 5);
playground.add(colorSelector, 0, 6);
playground.add(controls, 1, 0, 1, REMAINING); playground.add(controls, 1, 0, 1, REMAINING);
return playground; return playground;
@ -172,4 +181,67 @@ public class DatePickerPage extends AbstractPage {
setDisable(empty || date.compareTo(TODAY) < 0); setDisable(empty || date.compareTo(TODAY) < 0);
} }
} }
// This class shares stylesheet with the AccentColorSelector
private static class DatePickerColorSelector extends HBox {
private final Pane root;
public DatePickerColorSelector(Pane root) {
super();
this.root = root;
createView();
}
private void createView() {
var resetBtn = new Button("", new FontIcon(Material2AL.CLEAR));
resetBtn.getStyleClass().addAll(BUTTON_ICON, FLAT);
resetBtn.setOnAction(e -> resetColorVariables());
setAlignment(Pos.CENTER);
getChildren().setAll(
colorButton("-color-accent-emphasis", "-color-fg-emphasis"),
colorButton("-color-success-emphasis", "-color-fg-emphasis"),
colorButton("-color-danger-emphasis", "-color-fg-emphasis"),
resetBtn
);
getStyleClass().add("accent-color-selector");
}
private Button colorButton(String bgColorName, String fgColorName) {
var icon = new Region();
icon.getStyleClass().add("icon");
icon.setStyle("-color-primary:" + bgColorName + ";");
var btn = new Button("", icon);
btn.getStyleClass().addAll(BUTTON_ICON, FLAT, "color-button");
btn.setOnAction(e -> setColorVariables(bgColorName, fgColorName));
return btn;
}
private void setColorVariables(String bgColorName, String fgColorName) {
for (Node node : root.getChildren()) {
var style = String.format("-color-dp-border:%s;-color-dp-month-year-bg:%s;-color-dp-month-year-fg:%s;",
bgColorName,
bgColorName,
fgColorName
);
if (node instanceof InlineDatePicker dp) {
var popup = dp.lookup(".date-picker-popup");
if (popup != null) { popup.setStyle(style); }
}
}
}
private void resetColorVariables() {
for (Node node : root.getChildren()) {
if (node instanceof InlineDatePicker dp) {
var popup = dp.lookup(".date-picker-popup");
if (popup != null) { popup.setStyle(null); }
}
}
}
}
} }

7
sampler/src/main/resources/assets/styles/scss/layout/_components.scss
View File

@ -9,6 +9,9 @@
} }
.popover .date-picker-popup { .popover .date-picker-popup {
-fx-background-color: transparent; -color-dp-border: transparent;
-fx-background-insets: 0; -color-dp-bg: transparent;
-color-dp-day-bg: transparent;
-color-dp-month-year-bg: transparent;
-color-dp-day-bg-hover: -color-bg-subtle;
} }

113
styles/src/components/_date-picker.scss
View File

@ -4,22 +4,55 @@
@use "../settings/effects"; @use "../settings/effects";
@use "../settings/icons"; @use "../settings/icons";
$color-bg: -color-bg-default !default;
$color-border: -color-border-default !default;
$month-year-color-bg: -color-bg-default !default;
$month-year-color-fg: -color-fg-default !default;
$day-color-bg: -color-bg-default !default;
$day-color-bg-hover: -color-bg-subtle !default;
$day-color-bg-selected: -color-accent-emphasis !default;
$day-color-fg: -color-fg-default !default;
$day-color-fg-hover: -color-fg-default !default;
$day-color-fg-selected: -color-fg-emphasis !default;
$week-color-bg: -color-bg-default !default;
$week-color-fg: -color-accent-fg !default;
$today-color-bg: -color-accent-subtle !default;
$today-color-fg: -color-accent-fg !default;
$other-month-color-fg: -color-fg-muted !default;
$chrono-color-fg: -color-success-fg !default;
$content-padding-x: 8px !default; $content-padding-x: 8px !default;
$content-padding-y: 8px !default; $content-padding-y: 8px !default;
$month-year-pane-color-bg: -color-bg-default !default; $month-year-font-size: 1.1em !default;
$month-year-pane-color-fg: -color-fg-default !default;
$month-year-pane-font-size: 1.1em !default;
$cell-padding-x: 4px !default; $cell-padding-x: 4px !default;
$cell-padding-y: 8px !default; $cell-padding-y: 8px !default;
$day-name-font-size: 0.9em !default; $day-name-font-size: 0.9em !default;
// secondary chronology // secondary chronology
$chronology-fg: -color-success-fg !default; $chrono-label-margin: 0.5em !default;
$chronology-label-margin: 0.5em !default; $chrono-cell-size: 2.75em !default;
$chronology-cell-size: 2.75em !default; $chrono-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !default;
$chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !default;
@mixin _color-variables() {
-color-dp-bg: $color-bg;
-color-dp-border: $color-border;
-color-dp-month-year-bg: $month-year-color-bg;
-color-dp-month-year-fg: $month-year-color-fg;
-color-dp-day-bg: $day-color-bg;
-color-dp-day-bg-hover: $day-color-bg-hover;
-color-dp-day-bg-selected: $day-color-bg-selected;
-color-dp-day-fg: $day-color-fg;
-color-dp-day-fg-hover: $day-color-fg-hover;
-color-dp-day-fg-selected: $day-color-fg-selected;
-color-dp-week-bg: $week-color-bg;
-color-dp-week-fg: $week-color-fg;
-color-dp-today-bg: $today-color-bg;
-color-dp-today-fg: $today-color-fg;
-color-dp-other-month-fg: $other-month-color-fg;
-color-dp-chrono-fg: $chrono-color-fg;
}
.combo-box-base.date-picker { .combo-box-base.date-picker {
>.arrow-button { >.arrow-button {
@ -34,7 +67,8 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
} }
.date-picker-popup { .date-picker-popup {
-fx-background-color: -color-border-default, -color-bg-default; @include _color-variables();
-fx-background-color: -color-dp-border, -color-dp-bg;
-fx-background-insets: 0, 1; -fx-background-insets: 0, 1;
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-alignment: CENTER; -fx-alignment: CENTER;
@ -43,7 +77,7 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
>.month-year-pane { >.month-year-pane {
-fx-padding: $content-padding-y $content-padding-x $content-padding-y $content-padding-x; -fx-padding: $content-padding-y $content-padding-x $content-padding-y $content-padding-x;
-fx-background-color: $month-year-pane-color-bg; -fx-background-color: -color-dp-month-year-bg;
-fx-background-insets: 0; -fx-background-insets: 0;
// this one is actually HBox, but because of the class name it uses Spinner styles // this one is actually HBox, but because of the class name it uses Spinner styles
@ -53,7 +87,7 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
-fx-fill-height: false; -fx-fill-height: false;
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-border-color: transparent; -fx-border-color: transparent;
-fx-font-size: $month-year-pane-font-size; -fx-font-size: $month-year-font-size;
>.button { >.button {
-fx-background-color: transparent; -fx-background-color: transparent;
@ -63,30 +97,30 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
>.left-arrow { >.left-arrow {
@include icons.get("chevron-left", false); @include icons.get("chevron-left", false);
-fx-background-color: $month-year-pane-color-fg; -fx-background-color: -color-dp-month-year-fg;
} }
>.right-arrow { >.right-arrow {
@include icons.get("chevron-right", false); @include icons.get("chevron-right", false);
-fx-background-color: $month-year-pane-color-fg; -fx-background-color: -color-dp-month-year-fg;
} }
} }
>.label { >.label {
-fx-alignment: CENTER; -fx-alignment: CENTER;
-fx-text-fill: $month-year-pane-color-fg; -fx-text-fill: -color-dp-month-year-fg;
} }
} }
>.secondary-label { >.secondary-label {
-fx-alignment: BASELINE_CENTER; -fx-alignment: BASELINE_CENTER;
-fx-padding: $chronology-label-margin 0 0 0; -fx-padding: $chrono-label-margin 0 0 0;
-fx-text-fill: $month-year-pane-color-fg; -fx-text-fill: -color-dp-month-year-fg;
} }
} }
>.calendar-grid { >.calendar-grid {
-fx-background-color: -color-bg-default; -fx-background-color: -color-dp-bg;
-fx-padding: $content-padding-x; -fx-padding: $content-padding-x;
>.date-cell { >.date-cell {
@ -94,22 +128,22 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
-fx-padding: 0; -fx-padding: 0;
-fx-alignment: BASELINE_CENTER; -fx-alignment: BASELINE_CENTER;
-fx-opacity: 1.0; -fx-opacity: 1.0;
-fx-text-fill: -color-fg-default; -fx-text-fill: -color-dp-day-fg;
} }
>.week-number-cell { >.week-number-cell {
-fx-padding: $cell-padding-y $cell-padding-x $cell-padding-y $cell-padding-x; -fx-padding: $cell-padding-y $cell-padding-x $cell-padding-y $cell-padding-x;
-fx-background-color: -color-bg-default; -fx-background-color: -color-dp-week-bg;
-fx-text-fill: -color-accent-fg; -fx-text-fill: -color-dp-week-fg;
-fx-font-size: $day-name-font-size; -fx-font-size: $day-name-font-size;
} }
>.day-cell { >.day-cell {
-fx-padding: $cell-padding-y $cell-padding-x $cell-padding-y $cell-padding-x; -fx-padding: $cell-padding-y $cell-padding-x $cell-padding-y $cell-padding-x;
-fx-background-color: -color-bg-default; -fx-background-color: -color-dp-day-bg;
>.secondary-text { >.secondary-text {
-fx-fill: $chronology-fg; -fx-fill: -color-dp-chrono-fg;
} }
&:disabled { &:disabled {
@ -124,13 +158,13 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
>.hijrah-day-cell { >.hijrah-day-cell {
-fx-alignment: TOP_LEFT; -fx-alignment: TOP_LEFT;
-fx-padding: $chronology-cell-padding; -fx-padding: $chrono-cell-padding;
-fx-cell-size: $chronology-cell-size; -fx-cell-size: $chrono-cell-size;
} }
>.today { >.today {
-fx-background-color: -color-accent-subtle; -fx-background-color: -color-dp-today-bg;
-fx-text-fill: -color-accent-fg; -fx-text-fill: -color-dp-today-fg;
-fx-font-weight: bold; -fx-font-weight: bold;
} }
} }
@ -153,20 +187,20 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
>.back-button { >.back-button {
>.left-arrow { >.left-arrow {
@include icons.get("chevron-left", false); @include icons.get("chevron-left", false);
-fx-background-color: $month-year-pane-color-fg; -fx-background-color: -color-dp-month-year-fg;
} }
} }
>.forward-button { >.forward-button {
>.right-arrow { >.right-arrow {
@include icons.get("chevron-right", false); @include icons.get("chevron-right", false);
-fx-background-color: $month-year-pane-color-fg; -fx-background-color: -color-dp-month-year-fg;
} }
} }
>.label { >.label {
-fx-text-fill: $month-year-pane-color-fg; -fx-text-fill: -color-dp-month-year-fg;
-fx-font-size: $month-year-pane-font-size; -fx-font-size: $month-year-font-size;
} }
} }
@ -188,18 +222,25 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
.date-picker-popup>.calendar-grid>.selected>.secondary-text, .date-picker-popup>.calendar-grid>.selected>.secondary-text,
.date-picker-popup>.calendar-grid>.previous-month.selected, .date-picker-popup>.calendar-grid>.previous-month.selected,
.date-picker-popup>.calendar-grid>.next-month.selected { .date-picker-popup>.calendar-grid>.next-month.selected {
-fx-background-color: -color-accent-emphasis; -fx-background-color: -color-dp-day-bg-selected;
-fx-text-fill: -color-fg-emphasis; -fx-text-fill: -color-dp-day-fg-selected;
-fx-fill: -color-fg-emphasis; -fx-fill: -color-dp-day-fg-selected;
-fx-font-weight: normal; -fx-font-weight: normal;
} }
.date-picker-popup>.calendar-grid>.day-cell:hover { .date-picker-popup>.calendar-grid>.day-cell:hover {
-fx-background-color: -color-bg-subtle; -fx-background-color: -color-dp-day-bg-hover;
}
.date-picker-popup>.calendar-grid>.today:hover {
-fx-background-color: -color-dp-today-bg;
-fx-text-fill: -color-dp-today-fg;
} }
.date-picker-popup>.calendar-grid>.selected:hover { .date-picker-popup>.calendar-grid>.selected:hover {
-fx-background-color: -color-accent-emphasis; -fx-background-color: -color-dp-day-bg-selected;
-fx-text-fill: -color-dp-day-fg-selected;
-fx-fill: -color-dp-day-fg-selected;
} }
.date-picker-popup>.calendar-grid>.previous-month, .date-picker-popup>.calendar-grid>.previous-month,
@ -208,7 +249,7 @@ $chronology-cell-padding: 0.083333em $cell-padding-x 0.083333em 0.333333em !defa
.date-picker-popup>.calendar-grid>.next-month.today, .date-picker-popup>.calendar-grid>.next-month.today,
.date-picker-popup>.calendar-grid>.previous-month>.secondary-text, .date-picker-popup>.calendar-grid>.previous-month>.secondary-text,
.date-picker-popup>.calendar-grid>.next-month>.secondary-text { .date-picker-popup>.calendar-grid>.next-month>.secondary-text {
-fx-text-fill: -color-fg-muted; -fx-text-fill: -color-dp-other-month-fg;
-fx-fill: -color-fg-muted; -fx-fill: -color-dp-other-month-fg;
-fx-font-weight: normal; -fx-font-weight: normal;
} }