Merge branch 'master' into javascript-port-initial-work

Author: shai-almog

CodenameOne/src/com/codename1/ui/CN.java

@@ -842,6 +842,15 @@ public static void lockOrientation(boolean portrait) {
         Display.impl.lockOrientation(portrait);
     }
 
+    /// Returns true if orientation was locked using #lockOrientation(boolean) and not yet unlocked via #unlockOrientation().
+    ///
+    /// #### Returns
+    ///
+    /// true if orientation is currently marked as locked
+    public static boolean isLockOrientation() {
+        return Display.getInstance().isLockOrientation();
+    }
+
     /// This is the reverse method for lock orientation allowing orientation lock to be disabled
     public static void unlockOrientation() {
         Display.impl.unlockOrientation();

CodenameOne/src/com/codename1/ui/Display.java

@@ -309,6 +309,7 @@ public final class Display extends CN1Constants {
     private int previousKeyPressed;
     private int lastKeyPressed;
     private int lastDragOffset;
+    private boolean lockOrientation;
     private boolean disableScreenshots;
 
     // huge false positive from PMD...
@@ -4073,6 +4074,16 @@ public boolean isPortrait() {
         return impl.isPortrait();
     }
 
+
+    /// Returns true if orientation was locked using #lockOrientation(boolean) and not yet unlocked via #unlockOrientation().
+    ///
+    /// #### Returns
+    ///
+    /// true if orientation is currently marked as locked
+    public boolean isLockOrientation() {
+        return lockOrientation;
+    }
+
     /// Returns true if the device allows forcing the orientation via code, feature phones do not allow this
     /// although some include a jad property allowing for this feature
     ///
@@ -4115,6 +4126,7 @@ public boolean canForceOrientation() {
     /// - #canForceOrientation()
     public void lockOrientation(boolean portrait) {
         impl.lockOrientation(portrait);
+        lockOrientation = true;
     }
 
     /// This is the reverse method for lock orientation allowing orientation lock to be disabled
@@ -4132,6 +4144,7 @@ public void lockOrientation(boolean portrait) {
     /// - #canForceOrientation()
     public void unlockOrientation() {
         impl.unlockOrientation();
+        lockOrientation = false;
     }
 
     /// Indicates whether the device is a tablet, notice that this is often a guess

CodenameOne/src/com/codename1/ui/Sheet.java

@@ -122,12 +122,14 @@ public class Sheet extends Container {
     private static final int DEFAULT_TRANSITION_DURATION = 300;
     private final Sheet parentSheet;
     private final Label title = new Label();
+    private Component titleComponent = title;
     private final EventDispatcher closeListeners = new EventDispatcher();
     private final EventDispatcher backListeners = new EventDispatcher();
     private final Button backButton = new Button(FontImage.MATERIAL_CLOSE);
     private final Container commandsContainer = new Container(BoxLayout.x());
+    private final Container titleComponentContainer = FlowLayout.encloseCenterMiddle(title);
     private final Container titleBar = BorderLayout.center(LayeredLayout.encloseIn(
-            BorderLayout.center(FlowLayout.encloseCenterMiddle(title)),
+            BorderLayout.center(titleComponentContainer),
             BorderLayout.centerEastWest(null, commandsContainer, backButton)
     ));
     private final Container contentPane = new Container(BoxLayout.y());
@@ -399,6 +401,77 @@ public Container getCommandsContainer() {
         return commandsContainer;
     }
 
+    /// Gets the title text displayed in the default title label.
+    ///
+    /// #### Returns
+    ///
+    /// The sheet title text.
+    ///
+    /// #### Since
+    ///
+    /// 8.0
+    public String getTitle() {
+        return title.getText();
+    }
+
+    /// Sets the title text displayed in the default title label.
+    ///
+    /// If a custom title component is currently installed via {@link #setTitleComponent(Component)},
+    /// this method still updates the default title label so that it will be shown if the title
+    /// component is reset back to null.
+    ///
+    /// #### Parameters
+    ///
+    /// - `title`: The title text.
+    ///
+    /// #### Since
+    ///
+    /// 8.0
+    public void setTitle(String title) {
+        this.title.setText(title);
+    }
+
+    /// Gets the component currently used in the center of the title bar.
+    ///
+    /// #### Returns
+    ///
+    /// The current title component.
+    ///
+    /// #### Since
+    ///
+    /// 8.0
+    public Component getTitleComponent() {
+        return titleComponent;
+    }
+
+    /// Sets the title component rendered in the center of the title bar.
+    ///
+    /// This allows for custom title layouts such as including an image above the title text.
+    /// If `null` is passed, the default title label is restored.
+    ///
+    /// #### Parameters
+    ///
+    /// - `cmp`: The component to use for the title area, or `null` to restore the default title label.
+    ///
+    /// #### Since
+    ///
+    /// 8.0
+    public void setTitleComponent(Component cmp) {
+        if (cmp == null) {
+            cmp = title;
+        }
+        if (cmp == titleComponent) { //NOPMD CompareObjectsWithEquals
+            return;
+        }
+        if (cmp.getParent() != null) {
+            cmp.remove();
+        }
+        titleComponentContainer.removeAll();
+        titleComponentContainer.add(cmp);
+        titleComponent = cmp;
+        titleComponentContainer.revalidateLater();
+    }
+
     private void initUI() {
         setLayout(new BorderLayout());
         contentPane.setSafeArea(true);
@@ -449,7 +522,7 @@ public void show(final int duration) {
 
         // Set the padding in the content pane to match the corner radius
         Style s = getStyle();
-        Style titleParentStyle = title.getParent().getStyle();
+        Style titleParentStyle = titleComponentContainer.getStyle();
         titleParentStyle.setMarginLeft(titleMargin);
         titleParentStyle.setMarginRight(titleMargin);
         Border border = s.getBorder();

CodenameOne/src/com/codename1/ui/Tabs.java

@@ -583,7 +583,10 @@ private Component createTabImpl(RadioButton b) {
     /// component instance
     protected Component createTab(String title, Font font, char icon, float size) {
         RadioButton b = new RadioButton(title != null ? title : "");
-        FontImage.setIcon(b, font, icon, size);
+        if (tabUIID != null) {
+            b.setUIID(tabUIID);
+        }
+        b.setFontIcon(font, icon, size);
         createTabImpl(b);
         return b;
     }

CodenameOne/src/com/codename1/ui/plaf/LookAndFeel.java

@@ -1490,7 +1490,19 @@ public int getFadeScrollBarSpeed() {
 
     /// #### Parameters
     ///
-    /// - `fadeScrollBarSpeed`: the fadeScrollBarSpeed to set
+    /// - `fadeScrollBarSpeed`: per-frame opacity decrement used for fading the scrollbar.
+    ///   Larger values fade out faster.
+    ///
+    /// #### Notes
+    ///
+    /// - This value is **not milliseconds**.
+    /// - Approximate fade duration in milliseconds:
+    ///   `durationMs ~= (255 / fadeScrollBarSpeed) * (1000 / Display.getInstance().getFrameRate())`
+    /// - At 60 FPS, common values are:
+    ///   - `5`  -> about `850ms`
+    ///   - `3`  -> about `1400ms`
+    ///   - `2`  -> about `2100ms`
+    ///   - `1`  -> about `4250ms`
     public void setFadeScrollBarSpeed(int fadeScrollBarSpeed) {
         this.fadeScrollBarSpeed = fadeScrollBarSpeed;
     }