Merge branch 'toptensoftware#13'

clydebarrow · Aug 27, 2019 · 8ca6916 · 8ca6916
2 parents 881385c + 86a2893
commit 8ca6916
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/xcore/src/main/java/com/controlj/layout/FrameGroup.kt b/xcore/src/main/java/com/controlj/layout/FrameGroup.kt
@@ -28,7 +28,7 @@ import com.controlj.shim.CxFactory
  * determine where in the FrameGroup the child appears. The position of each child is independent of
  * all other children
  */
-open class FrameGroup(layout: Layout = Layout()) : ViewGroup(layout) {
+open class FrameGroup(layout: Layout = Layout(), name: String = "") : ViewGroup(layout, name) {
 
     /**
      * The measured size of a frame group is the smallest box that will enclose all its subviews.

diff --git a/xcore/src/main/java/com/controlj/layout/Layout.kt b/xcore/src/main/java/com/controlj/layout/Layout.kt
@@ -88,6 +88,11 @@ class Layout(
             return Layout(widthMode = Mode.MatchParent, heightMode = Mode.MatchParent)
         }
 
+        fun matchWidth(): Layout = Layout(widthMode = Mode.MatchParent)
+        fun matchHeight(): Layout = Layout(heightMode = Mode.MatchParent)
+        fun weightedWidth(weight: Double = 1.0): Layout = Layout(widthMode = Mode.Weighted, weight = weight)
+        fun weightedHeight(weight: Double = 1.0): Layout = Layout(heightMode = Mode.Weighted, weight = weight)
+
         fun absolute(width: Double, height: Double): Layout {
             return Layout(width, Mode.Absolute, height, Mode.Absolute)
         }