You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/07/05 07:19:37 UTC
[isis] branch master updated: ISIS-2340: fx: add initial css ...
italic prototyping buttons
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5261f3a ISIS-2340: fx: add initial css ... italic prototyping buttons
5261f3a is described below
commit 5261f3ae4074b44c410793b692f1e1001c341cc8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jul 5 09:19:19 2020 +0200
ISIS-2340: fx: add initial css ... italic prototyping buttons
---
.../javafx/ui/decorator/prototyping/PrototypingButtonDecorator.java | 3 +++
.../javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java | 2 +-
.../org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilder.java | 2 +-
incubator/viewers/javafx/ui/src/main/resources/ui.css | 4 ++++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingButtonDecorator.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingButtonDecorator.java
index a2b52e9..2c74f2f 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingButtonDecorator.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingButtonDecorator.java
@@ -47,6 +47,9 @@ public class PrototypingButtonDecorator implements PrototypingDecorator<Node> {
prototypingLabel.setTooltip(new Tooltip("Inspect Metamodel"));
prototypingLabel.setOnMouseClicked(e->
prototypingInfoService.showPrototypingPopup(prototypingUiModel));
+
+ uiButton.getStyleClass().add("button-prototyping");
+
return span;
}
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
index 2cde06a..4cef0f3 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/prototyping/PrototypingInfoPopupProvider.java
@@ -53,7 +53,7 @@ public class PrototypingInfoPopupProvider {
public void showPrototypingPopup(final PrototypingUiModel prototypingUiModel) {
val infoNode = getPrototypingInfoUiComponent(prototypingUiModel);
val headerText = prototypingUiModel.getFeatureFullLabel();
- val contentText = (String)null;
+ val contentText = prototypingUiModel.getFeatureType().toString();
Dialogs.message("Inspect Metamodel", headerText, contentText, infoNode);
}
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilder.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilder.java
index 9913e22..431948c 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilder.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiBuilder.java
@@ -58,11 +58,11 @@ public class UiBuilder {
fxmlLoader.setControllerFactory(springContext::getBean);
val uiRoot = (Parent)fxmlLoader.load();
val scene = new Scene(uiRoot);
+ scene.getStylesheets().add("/ui.css");
val stage = event.getStage();
stage.setScene(scene);
setupTitle(stage);
setupIcon(stage);
-
stage.show();
}
diff --git a/incubator/viewers/javafx/ui/src/main/resources/ui.css b/incubator/viewers/javafx/ui/src/main/resources/ui.css
new file mode 100644
index 0000000..c27fb30
--- /dev/null
+++ b/incubator/viewers/javafx/ui/src/main/resources/ui.css
@@ -0,0 +1,4 @@
+.button-prototyping {
+ -fx-font-style: italic;
+/* -fx-background-color: #CCFF99; */
+}
\ No newline at end of file