From 7b4b53f3a4e94586157f178832d98eb9d21bdff6 Mon Sep 17 00:00:00 2001 From: ThomasH99 Date: Sat, 30 Sep 2017 10:46:07 +0200 Subject: [PATCH 1/3] --- CodenameOne/src/com/codename1/components/SpanButton.java | 2 ++ CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java | 3 ++- CodenameOne/src/com/codename1/ui/layouts/BoxLayout.java | 3 ++- CodenameOne/src/com/codename1/ui/layouts/FlowLayout.java | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CodenameOne/src/com/codename1/components/SpanButton.java b/CodenameOne/src/com/codename1/components/SpanButton.java index b0b33aa236..7c22071cf1 100644 --- a/CodenameOne/src/com/codename1/components/SpanButton.java +++ b/CodenameOne/src/com/codename1/components/SpanButton.java @@ -234,6 +234,8 @@ public String getIconPosition() { */ public void setCommand(Command cmd) { actualButton.setCommand(cmd); + actualButton.setText(""); //remove any text set by cmd for the actualButton since text from Command should only be shown for the TextArea + setText(cmd.getCommandName()); //use the text of the Command (since Button is hidden) } /** diff --git a/CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java b/CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java index 3aa985bee2..4b655550de 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java +++ b/CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java @@ -453,12 +453,13 @@ private void positionTopBottom(Component target, Component c, int right, int lef c.setHeight(Math.min(targetHeight, c.getPreferredH())); //verify I want to use tge prefered size } - private Dimension dim = new Dimension(0, 0); +// private Dimension dim = new Dimension(0, 0); //moved into getPreferredSize, otherwise the same dim instance can be used both as preferredSize and scrollSize which creates side effects when preferredSize is forced to (0,0) in setHidden(true) /** * {@inheritDoc} */ public Dimension getPreferredSize(Container parent) { + Dimension dim = new Dimension(0, 0); dim.setWidth(0); dim.setHeight(0); Component east = getEast(); diff --git a/CodenameOne/src/com/codename1/ui/layouts/BoxLayout.java b/CodenameOne/src/com/codename1/ui/layouts/BoxLayout.java index 5ab3e8d2ef..0404cd8cf4 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/BoxLayout.java +++ b/CodenameOne/src/com/codename1/ui/layouts/BoxLayout.java @@ -203,7 +203,7 @@ public void layoutContainer(Container parent) { } } - private Dimension dim = new Dimension(0, 0); +// private Dimension dim = new Dimension(0, 0); //moved into getPreferredSize, otherwise the same dim instance can be used both as preferredSize and scrollSize which creates side effects when preferredSize is forced to (0,0) in setHidden(true) /** * {@inheritDoc} @@ -228,6 +228,7 @@ public Dimension getPreferredSize(Container parent) { } } Style s = parent.getStyle(); + Dimension dim = new Dimension(0, 0); dim.setWidth(width + s.getHorizontalPadding()); dim.setHeight(height + s.getVerticalPadding()); return dim; diff --git a/CodenameOne/src/com/codename1/ui/layouts/FlowLayout.java b/CodenameOne/src/com/codename1/ui/layouts/FlowLayout.java index 887e4ae3d4..0b460e03c6 100644 --- a/CodenameOne/src/com/codename1/ui/layouts/FlowLayout.java +++ b/CodenameOne/src/com/codename1/ui/layouts/FlowLayout.java @@ -290,7 +290,7 @@ private void moveComponents(Container target, int x, int y, int width, int heigh } } - private Dimension dim = new Dimension(0, 0); +// private Dimension dim = new Dimension(0, 0);//moved into getPreferredSize, otherwise the same dim instance can be used both as preferredSize and scrollSize which creates side effects when preferredSize is forced to (0,0) in setHidden(true) /** * {@inheritDoc} @@ -322,6 +322,7 @@ public Dimension getPreferredSize(Container parent) { width = Math.max(w, width); + Dimension dim = new Dimension(0, 0); dim.setWidth(width + parent.getStyle().getPaddingLeftNoRTL()+ parent.getStyle().getPaddingRightNoRTL()); dim.setHeight(height + parent.getStyle().getPaddingTop()+ parent.getStyle().getPaddingBottom()); return dim; From 82579bc8c536bc5e4b8017faaec2b1374b2af2ed Mon Sep 17 00:00:00 2001 From: ThomasH99 Date: Sat, 30 Sep 2017 14:18:15 +0200 Subject: [PATCH 2/3] Revert "" This reverts commit 7b4b53f3a4e94586157f178832d98eb9d21bdff6. --- CodenameOne/src/com/codename1/components/SpanButton.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/CodenameOne/src/com/codename1/components/SpanButton.java b/CodenameOne/src/com/codename1/components/SpanButton.java index 7c22071cf1..5fda161ace 100644 --- a/CodenameOne/src/com/codename1/components/SpanButton.java +++ b/CodenameOne/src/com/codename1/components/SpanButton.java @@ -233,8 +233,6 @@ public String getIconPosition() { * @param cmd the command */ public void setCommand(Command cmd) { - actualButton.setCommand(cmd); - actualButton.setText(""); //remove any text set by cmd for the actualButton since text from Command should only be shown for the TextArea setText(cmd.getCommandName()); //use the text of the Command (since Button is hidden) } From 27f7b627dc3956583ff5a649e485b9b9c7dbfb17 Mon Sep 17 00:00:00 2001 From: ThomasH99 Date: Sat, 30 Sep 2017 14:20:16 +0200 Subject: [PATCH 3/3] Revert "" This reverts commit 7b4b53f3a4e94586157f178832d98eb9d21bdff6. --- CodenameOne/src/com/codename1/components/SpanButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodenameOne/src/com/codename1/components/SpanButton.java b/CodenameOne/src/com/codename1/components/SpanButton.java index 5fda161ace..b0b33aa236 100644 --- a/CodenameOne/src/com/codename1/components/SpanButton.java +++ b/CodenameOne/src/com/codename1/components/SpanButton.java @@ -233,7 +233,7 @@ public String getIconPosition() { * @param cmd the command */ public void setCommand(Command cmd) { - setText(cmd.getCommandName()); //use the text of the Command (since Button is hidden) + actualButton.setCommand(cmd); } /**