diff options
| author | Sven Gothel <[email protected]> | 2023-09-04 05:39:05 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-09-04 06:28:26 +0200 |
| commit | 4ca9efd6759856f46eb0cedde28998bc2b68d2cb (patch) | |
| tree | e3793bf608e2f71a1e1a76604f105e4e924f168e /src/graphui | |
| parent | c3bb3fb871a92a71e7a6b05897a3dd9b62842fc5 (diff) | |
GraphUI: Button/Label: Complete String -> CharSequence type change for text, rename Button set{Label->Text}(..), adjust demo/text code
Diffstat (limited to 'src/graphui')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java index 72589937d..474cc0a6a 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java @@ -327,14 +327,14 @@ public class Button extends BaseButton { } return this; } - public final Button setLabel(final String labelText) { + public final Button setText(final CharSequence labelText) { if( !label.getText().equals(labelText) ) { label.setText(labelText); markShapeDirty(); } return this; } - public final Button setLabel(final Font labelFont, final String labelText) { + public final Button setText(final Font labelFont, final CharSequence labelText) { if( !label.getText().equals(labelText) || !label.getFont().equals(labelFont) ) { label.setFont(labelFont); label.setText(labelText); diff --git a/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java index 3192488c2..a01b892ad 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java @@ -91,7 +91,7 @@ public class Label extends GraphShape { * @param text the text to be set. * @return true if text has been updated, false if unchanged. */ - public boolean setText(final String text) { + public boolean setText(final CharSequence text) { if( !this.text.equals(text) ) { this.text = text; markShapeDirty(); @@ -107,7 +107,7 @@ public class Label extends GraphShape { * @param text the text to be set. * @return true if text has been updated, false if unchanged. */ - public boolean setText(final GL2ES2 gl, final String text) { + public boolean setText(final GL2ES2 gl, final CharSequence text) { if( setText(text) ) { validate(gl); return true; @@ -122,7 +122,7 @@ public class Label extends GraphShape { * @param text the text to be set. * @return true if text has been updated, false if unchanged. */ - public boolean setText(final GLProfile glp, final String text) { + public boolean setText(final GLProfile glp, final CharSequence text) { if( setText(text) ) { validate(glp); return true; diff --git a/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java b/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java index 74dcb8491..3809c3a07 100644 --- a/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java +++ b/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java @@ -58,7 +58,7 @@ public class Label0 { this.rgbaColor.set(v); } - public final void setText(final String text) { + public final void setText(final CharSequence text) { this.text = text; } |