From ddd6cac8cc658ce542cb98e85f7d262f9917d37a Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 5 Sep 2023 02:54:42 +0200 Subject: GraphUI Layout: Fix BoxLayout scale, margin and padding; Add same padding behavior to BoxLayout and GridLayout. For all: - Padding is applied to each {@Shape} via {@link Shape#setPaddding(Padding)} if passed in constructor BoxLayout: - Optionally centered {@link Alignment.Bit#CenterHoriz horizontally}, {@link Alignment.Bit#CenterVert vertically} or {@link Alignment#Center both}. - Optionally scaled to cell-size if given and {@link Alignment#Fill} - Margin is ignored on dimension with center {@link Alignment} - Not implemented {@link Alignment}: Top, Right, Bottom, Left GridLayout: - Optionally centered {@link Alignment.Bit#CenterHoriz horizontally}, {@link Alignment.Bit#CenterVert vertically} or {@link Alignment#Center both}. - Optionally scaled to cell-size if given and {@link Alignment#Fill} - Without cell-size behaves like a grid bag using individual shape sizes including padding - Can be filled in {@link Order#COLUMN} or {@link Order#ROW} major-order. - Not implemented {@link Alignment}: Top, Right, Bottom, Left Changes to Group.Layout interface: - Added preValidate(Shape) allowing to prepare the shape before validation, used to inject Padding Changes to Margin: - Removed the complex CENTER property and using Alignment in BoxLayout as well Changes to BoxLayout: - Using Alignment +++ Tested via UILayoutBox01 and UILayoutGrid01, try the tooltip by clicking on the group's description label. --- make/scripts/tests.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'make') diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 572bb8f01..13e92928c 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -338,6 +338,7 @@ function jrun() { #D_ARGS="-Djogl.debug.DebugGL" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.graph.curve.Instance -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.graph.curve.triangulation.LINE_AA -Djogl.debug.graph.curve.Triangulation -Djogl.debug.graph.font.Renderer" + #D_ARGS="-Djogl.debug.graph.font.Font" #D_ARGS="-Djogl.debug.graph.font.Font -Djogl.debug.graph.font.Renderer -Djogl.debug.graph.font.Renderer.Code" #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.graph.curve.vbaa.resizeLowerBoundary=100" #D_ARGS="-Djogl.debug.GLSLCode" @@ -1007,8 +1008,8 @@ function testawtswt() { #testawt com.jogamp.opengl.demos.es2.GearsES2 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UIGraphDemoU01a $* #testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutGrid01 $* -#testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutBox01 $* -testnoawt com.jogamp.opengl.demos.graph.ui.FontView01 $* +testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutBox01 $* +#testnoawt com.jogamp.opengl.demos.graph.ui.FontView01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT21 $* #testnoawt com.jogamp.opengl.demos.av.MovieCube $* -- cgit v1.2.3