You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2021/11/12 17:09:05 UTC
[isis] 04/07: ISIS-2348 RoDisplay moved into builder dir,
spacing extracted to Constants
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 310e780fdae771c166f66609f26fc620285537b7
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri Nov 12 17:20:08 2021 +0100
ISIS-2348 RoDisplay moved into builder dir, spacing extracted to Constants
---
.../isis/client/kroviz/ui/builder/ColBuilder.kt | 19 ++++++++++---------
.../isis/client/kroviz/ui/builder/FieldSetBuilder.kt | 1 -
.../isis/client/kroviz/ui/builder/LayoutBuilder.kt | 1 -
.../client/kroviz/ui/{core => builder}/RoDisplay.kt | 11 +++++------
.../isis/client/kroviz/ui/builder/RowBuilder.kt | 4 ++--
.../isis/client/kroviz/ui/builder/TabBuilder.kt | 1 -
.../isis/client/kroviz/ui/builder/TabGroupBuilder.kt | 1 -
.../apache/isis/client/kroviz/ui/core/Constants.kt | 2 ++
.../apache/isis/client/kroviz/ui/core/UiManager.kt | 1 +
9 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt
index 02f9ac5..eec96ab 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/ColBuilder.kt
@@ -25,8 +25,8 @@ import io.kvision.panel.HPanel
import io.kvision.panel.SimplePanel
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.to.bs3.Col
+import org.apache.isis.client.kroviz.ui.core.Constants
import org.apache.isis.client.kroviz.ui.core.MenuFactory
-import org.apache.isis.client.kroviz.ui.core.RoDisplay
import org.apache.isis.client.kroviz.ui.core.RoTable
import org.apache.isis.client.kroviz.utils.StringUtils
import kotlin.math.round
@@ -79,12 +79,13 @@ class ColBuilder : UiBuilder() {
private fun buildPanel(): FlexPanel {
return FlexPanel(
- FlexDirection.COLUMN,
- FlexWrap.NOWRAP,
- JustifyContent.SPACEBETWEEN,
- AlignItems.CENTER,
- AlignContent.STRETCH,
- spacing = 10)
+ FlexDirection.COLUMN,
+ FlexWrap.NOWRAP,
+ JustifyContent.SPACEBETWEEN,
+ AlignItems.CENTER,
+ AlignContent.STRETCH,
+ spacing = Constants.spacing
+ )
}
fun createMenu(tObject: TObject, dsp: RoDisplay): HPanel {
@@ -92,8 +93,8 @@ class ColBuilder : UiBuilder() {
style(panel)
val dd = MenuFactory.buildForObject(tObject)
- dd.marginTop = CssSize(10, UNIT.px)
- dd.marginBottom = CssSize(10, UNIT.px)
+ dd.marginTop = CssSize(Constants.spacing, UNIT.px)
+ dd.marginBottom = CssSize(Constants.spacing, UNIT.px)
dd.width = CssSize(100, UNIT.perc)
MenuFactory.amendWithSaveUndo(dd, tObject)
MenuFactory.disableSaveUndo(dd)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/FieldSetBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/FieldSetBuilder.kt
index 208c0eb..744af77 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/FieldSetBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/FieldSetBuilder.kt
@@ -24,7 +24,6 @@ import org.apache.isis.client.kroviz.to.TypeMapper
import org.apache.isis.client.kroviz.to.bs3.FieldSet
import org.apache.isis.client.kroviz.ui.core.FormItem
import org.apache.isis.client.kroviz.ui.core.FormPanelFactory
-import org.apache.isis.client.kroviz.ui.core.RoDisplay
class FieldSetBuilder {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/LayoutBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/LayoutBuilder.kt
index 7d28092..1bc51fc 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/LayoutBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/LayoutBuilder.kt
@@ -21,7 +21,6 @@ package org.apache.isis.client.kroviz.ui.builder
import io.kvision.panel.VPanel
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.to.bs3.Grid
-import org.apache.isis.client.kroviz.ui.core.RoDisplay
class LayoutBuilder {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDisplay.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RoDisplay.kt
similarity index 89%
rename from incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDisplay.kt
rename to incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RoDisplay.kt
index ecd6b7f..a04eb1e 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDisplay.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RoDisplay.kt
@@ -16,17 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.client.kroviz.ui.core
+package org.apache.isis.client.kroviz.ui.builder
-import io.kvision.core.CssSize
-import io.kvision.core.FontStyle
-import io.kvision.core.FontWeight
-import io.kvision.core.UNIT
+import io.kvision.core.*
import io.kvision.dropdown.DropDown
import io.kvision.panel.VPanel
import org.apache.isis.client.kroviz.core.model.ObjectDM
import org.apache.isis.client.kroviz.to.TObject
-import org.apache.isis.client.kroviz.ui.builder.LayoutBuilder
+import org.apache.isis.client.kroviz.ui.core.Displayable
+import org.apache.isis.client.kroviz.ui.core.MenuFactory
class RoDisplay(val displayModel: ObjectDM) : Displayable, VPanel() {
@@ -38,6 +36,7 @@ class RoDisplay(val displayModel: ObjectDM) : Displayable, VPanel() {
val tObject: TObject = model.delegate
val grid = displayModel.grid!!
objectPanel = LayoutBuilder().create(grid, tObject, this)
+ objectPanel.overflow = Overflow.AUTO
objectPanel.width = CssSize(100, UNIT.perc)
add(objectPanel)
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RowBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RowBuilder.kt
index 2f8afea..c537eb6 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RowBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/RowBuilder.kt
@@ -23,7 +23,7 @@ import io.kvision.panel.FlexPanel
import io.kvision.panel.SimplePanel
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.to.bs3.Row
-import org.apache.isis.client.kroviz.ui.core.RoDisplay
+import org.apache.isis.client.kroviz.ui.core.Constants
class RowBuilder : UiBuilder() {
@@ -45,7 +45,7 @@ class RowBuilder : UiBuilder() {
JustifyContent.FLEXSTART,
AlignItems.FLEXSTART,
AlignContent.STRETCH,
- spacing = 10)
+ spacing = Constants.spacing)
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabBuilder.kt
index b8a6fb2..30aab37 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabBuilder.kt
@@ -20,7 +20,6 @@ package org.apache.isis.client.kroviz.ui.builder
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.to.bs3.Tab
-import org.apache.isis.client.kroviz.ui.core.RoDisplay
import io.kvision.core.Component
import io.kvision.panel.SimplePanel
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabGroupBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabGroupBuilder.kt
index ac05b90..02aca31 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabGroupBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/builder/TabGroupBuilder.kt
@@ -20,7 +20,6 @@ package org.apache.isis.client.kroviz.ui.builder
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.to.bs3.TabGroup
-import org.apache.isis.client.kroviz.ui.core.RoDisplay
import io.kvision.core.Component
import io.kvision.panel.TabPanel
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/Constants.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/Constants.kt
index 076960a..53505fd 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/Constants.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/Constants.kt
@@ -39,4 +39,6 @@ object Constants {
const val demoUser = "sven"
const val demoPass = "pass"
const val demoUrlRemote = "https://demo-wicket.jdo.isis.incode.work/"
+
+ const val spacing = 10
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
index cb85cb8..9f7a6ad 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
@@ -38,6 +38,7 @@ import org.apache.isis.client.kroviz.core.model.ObjectDM
import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.to.ValueType
import org.apache.isis.client.kroviz.to.mb.Menubars
+import org.apache.isis.client.kroviz.ui.builder.RoDisplay
import org.apache.isis.client.kroviz.ui.kv.override.RoTab
import org.apache.isis.client.kroviz.utils.*
import org.w3c.dom.events.KeyboardEvent