You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/08/24 14:50:03 UTC
[causeway] branch master updated: CAUSEWAY-3536: cosmetic: fixes fa-icons too large in tables
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 62284663ae CAUSEWAY-3536: cosmetic: fixes fa-icons too large in tables
62284663ae is described below
commit 62284663aea7fdf9cb80353c181f0b537d08911f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 24 16:49:57 2023 +0200
CAUSEWAY-3536: cosmetic: fixes fa-icons too large in tables
---
.../ui/components/ScalarPanelAbstractLegacy.java | 15 +++++------
.../viewer/commons/model/hints/RenderingHint.java | 25 +++++++++++--------
.../entity/icontitle/EntityIconAndTitlePanel.java | 7 ++++--
.../ui/components/scalars/ScalarPanelAbstract.java | 29 +++++++++-------------
.../scalars/choices/ObjectChoicesSelect2Panel.java | 2 +-
.../scalars/choices/ValueChoicesSelect2Panel.java | 2 +-
.../widgets/zclip/ZeroClipboardPanel.java | 3 +--
7 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
index 30f01fc8af..8f1b79f3dc 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
@@ -55,19 +55,16 @@ extends PanelAbstract<ManagedObject, ScalarModel> {
private void buildGui() {
- switch(scalarModel().getRenderingHint()) {
- case REGULAR:
- regularFrame = createRegularFrame();
- compactFrame = createShallowCompactFrame();
- regularFrame.setVisible(true);
- compactFrame.setVisible(false);
- break;
- default:
+ if(scalarModel().getRenderingHint().isInTable()) {
regularFrame = createShallowRegularFrame();
compactFrame = createCompactFrame();
regularFrame.setVisible(false);
compactFrame.setVisible(true);
- break;
+ } else {
+ regularFrame = createRegularFrame();
+ compactFrame = createShallowCompactFrame();
+ regularFrame.setVisible(true);
+ compactFrame.setVisible(false);
}
addOrReplace(regularFrame, compactFrame);
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/hints/RenderingHint.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/hints/RenderingHint.java
index 9727b13c18..2da5e8fd94 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/hints/RenderingHint.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/hints/RenderingHint.java
@@ -24,7 +24,8 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum RenderingHint {
- // normal form
+
+ // regular
REGULAR(Where.OBJECT_FORMS),
// inside parent table
@@ -40,9 +41,9 @@ public enum RenderingHint {
return this.where;
}
- public boolean isRegular() {
- return this == REGULAR;
- }
+// public boolean isRegular() {
+// return this == REGULAR;
+// }
public boolean isInParentedTable() {
return this == PARENTED_PROPERTY_COLUMN;
@@ -52,6 +53,14 @@ public enum RenderingHint {
return this == STANDALONE_PROPERTY_COLUMN;
}
+ public boolean isInParentedTableTitleColumn() {
+ return this == PARENTED_TITLE_COLUMN;
+ }
+
+ public boolean isInStandaloneTableTitleColumn() {
+ return this == STANDALONE_TITLE_COLUMN;
+ }
+
public boolean isInTable() {
return isInParentedTable() || isInStandaloneTable() || isInTableTitleColumn();
}
@@ -60,12 +69,8 @@ public enum RenderingHint {
return isInParentedTableTitleColumn() || isInStandaloneTableTitleColumn();
}
- public boolean isInParentedTableTitleColumn() {
- return this == PARENTED_TITLE_COLUMN;
- }
-
- public boolean isInStandaloneTableTitleColumn() {
- return this == STANDALONE_TITLE_COLUMN;
+ public boolean isNotInTable() {
+ return !isInTable();
}
}
\ No newline at end of file
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index a3eb0ac173..951e372c5c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -118,7 +118,10 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
cssClassFaFactory->{
WktComponents.permanentlyHide(link, ID_ENTITY_ICON);
final Label dummyLabel = Wkt.labelAdd(link, ID_ENTITY_FONT_AWESOME, "");
- Wkt.cssAppend(dummyLabel, cssClassFaFactory.asSpaceSeparatedWithAdditional("fa-2x"));
+ val faSizeModifier = getModel().getRenderingHint().isInTable()
+ ? "fa-lg"
+ : "fa-2x";
+ Wkt.cssAppend(dummyLabel, cssClassFaFactory.asSpaceSeparatedWithAdditional(faSizeModifier));
});
final TitleRecord title = determineTitle(linkedDomainObject);
@@ -137,7 +140,7 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
private boolean isTitleSuppressed() {
return getModel().isInlinePrompt()
//XXX CAUSEWAY-1699 never hide titles of object references in tables
- && !getModel().getRenderingHint().isInTable();
+ && getModel().getRenderingHint().isNotInTable();
}
private AbstractLink createDynamicallyVisibleLink(final ManagedObject linkedDomainObject) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 12f7a94ce4..7012f80ea1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -130,7 +130,7 @@ implements ScalarModelChangeListener {
static RenderScenario inferFrom(final ScalarPanelAbstract scalarPanel) {
val scalarModel = scalarPanel.scalarModel();
- if(!scalarModel.getRenderingHint().isRegular()) {
+ if(scalarModel.getRenderingHint().isInTable()) {
return COMPACT;
}
if(scalarModel.isParameter()
@@ -284,8 +284,15 @@ implements ScalarModelChangeListener {
scalarFrameContainer = Wkt.containerAdd(this, ID_SCALAR_TYPE_CONTAINER);
Wkt.cssAppend(scalarFrameContainer, getCssClassName());
- switch(scalarModel.getRenderingHint()) {
- case REGULAR:
+ if(scalarModel.getRenderingHint().isInTable()) {
+ regularFrame = createShallowRegularFrame();
+ compactFrame = createCompactFrame();
+ regularFrame.setVisible(false);
+ compactFrame.setVisible(true);
+
+ scalarFrameContainer.addOrReplace(compactFrame, regularFrame,
+ formFrame = createFormFrame());
+ } else {
regularFrame = Wkt.ajaxEnable(createRegularFrame());
compactFrame = createShallowCompactFrame();
regularFrame.setVisible(true);
@@ -301,18 +308,6 @@ implements ScalarModelChangeListener {
addFeedbackOnlyTo(regularFrame, getValidationFeedbackReceiver());
setupInlinePrompt();
-
- break;
- default:
- regularFrame = createShallowRegularFrame();
- compactFrame = createCompactFrame();
- regularFrame.setVisible(false);
- compactFrame.setVisible(true);
-
- scalarFrameContainer.addOrReplace(compactFrame, regularFrame,
- formFrame = createFormFrame());
-
- break;
}
// prevent from tabbing into non-editable widgets.
@@ -358,11 +353,11 @@ implements ScalarModelChangeListener {
* <p>Is added to {@link #getScalarFrameContainer()}.
*/
protected WebMarkupContainer createFormFrame() {
- val isRegular = scalarModel().getRenderingHint().isRegular();
+ val isNotInTable = scalarModel().getRenderingHint().isNotInTable();
return (WebMarkupContainer)FrameFragment.INLINE_PROMPT_FORM
.createComponent(WebMarkupContainer::new)
.setVisible(false)
- .setOutputMarkupId(isRegular);
+ .setOutputMarkupId(isNotInTable);
}
// -- FRAME SWITCHING
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
index 42ac3a96a2..6023e05702 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ObjectChoicesSelect2Panel.java
@@ -64,7 +64,7 @@ implements ChoiceTitleHandler {
public ObjectChoicesSelect2Panel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
- this.isCompactFormat = !scalarModel.getRenderingHint().isRegular();
+ this.isCompactFormat = scalarModel.getRenderingHint().isInTable();
}
@Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
index 2591ba2482..9fdb68229d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/choices/ValueChoicesSelect2Panel.java
@@ -45,7 +45,7 @@ implements ChoiceTitleHandler {
public ValueChoicesSelect2Panel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
- this.isCompactFormat = !scalarModel.getRenderingHint().isRegular();
+ this.isCompactFormat = scalarModel.getRenderingHint().isInTable();
}
@Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index 84c6c72e42..8b92cb95bb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -25,7 +25,6 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.wicket.model.models.ObjectAdapterModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
@@ -59,7 +58,7 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
ObjectAdapterModel model = getModel();
addSimpleClipboardModalWindow();
- setVisible(model.getRenderingHint() == RenderingHint.REGULAR
+ setVisible(model.getRenderingHint().isNotInTable()
&& model.isViewingMode());
// disable, since currently not honoured if used as a URL (think that session hints are taking precedence).