Keep default picker layout unchanged without custom buttons

Author: liannacasper

CodenameOne/src/com/codename1/ui/spinner/Picker.java

@@ -585,17 +585,21 @@ protected void deinitialize() {
                         .setBgTransparency(0)
                         .setMargin(0)
                         .setPaddingMillimeters(3f, 0);
-                Container spinnerSection = new Container(new BorderLayout());
-                spinnerSection.add(BorderLayout.CENTER, wrapper);
                 Container topCustomButtons = createLightweightPopupButtonRow(spinner, LightweightPopupButtonPlacement.ABOVE_SPINNER, isTablet);
-                if (topCustomButtons != null) {
-                    spinnerSection.add(BorderLayout.NORTH, topCustomButtons);
-                }
                 Container bottomCustomButtons = createLightweightPopupButtonRow(spinner, LightweightPopupButtonPlacement.BELOW_SPINNER, isTablet);
-                if (bottomCustomButtons != null) {
-                    spinnerSection.add(BorderLayout.SOUTH, bottomCustomButtons);
+                if (topCustomButtons != null || bottomCustomButtons != null) {
+                    Container spinnerSection = new Container(new BorderLayout());
+                    spinnerSection.add(BorderLayout.CENTER, wrapper);
+                    if (topCustomButtons != null) {
+                        spinnerSection.add(BorderLayout.NORTH, topCustomButtons);
+                    }
+                    if (bottomCustomButtons != null) {
+                        spinnerSection.add(BorderLayout.SOUTH, bottomCustomButtons);
+                    }
+                    dlg.getContentPane().add(BorderLayout.CENTER, spinnerSection);
+                } else {
+                    dlg.getContentPane().add(BorderLayout.CENTER, wrapper);
                 }
-                dlg.getContentPane().add(BorderLayout.CENTER, spinnerSection);
 
 
                 Button doneButton = new Button("Done", isTablet ? "PickerButtonTablet" : "PickerButton");

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/Cn1ssDeviceRunner.java

@@ -74,6 +74,7 @@ public final class Cn1ssDeviceRunner extends DeviceRunner {
             new TabsScreenshotTest(),
             new TextAreaAlignmentScreenshotTest(),
             new ValidatorLightweightPickerScreenshotTest(),
+            new LightweightPickerDefaultScreenshotTest(),
             new LightweightPickerButtonsScreenshotTest(),
             new ToastBarTopPositionScreenshotTest(),
             // Keep this as the last screenshot test; orientation changes can leak into subsequent screenshots.

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/LightweightPickerDefaultScreenshotTest.java

@@ -0,0 +1,34 @@
+package com.codenameone.examples.hellocodenameone.tests;
+
+import com.codename1.ui.Display;
+import com.codename1.ui.Form;
+import com.codename1.ui.layouts.BoxLayout;
+import com.codename1.ui.spinner.Picker;
+import com.codename1.ui.util.UITimer;
+
+import java.util.Date;
+
+/**
+ * Baseline screenshot for lightweight picker popup without any custom quick-action buttons.
+ */
+public class LightweightPickerDefaultScreenshotTest extends BaseTest {
+    private Picker picker;
+
+    @Override
+    public boolean runTest() {
+        Form form = createForm("Picker Default Popup", BoxLayout.y(), "LightweightPickerDefault");
+        picker = new Picker();
+        picker.setType(Display.PICKER_TYPE_DATE);
+        picker.setUseLightweightPopup(true);
+        picker.setDate(new Date());
+        form.add(picker);
+        form.show();
+        return true;
+    }
+
+    @Override
+    protected void registerReadyCallback(Form parent, Runnable run) {
+        picker.startEditingAsync();
+        UITimer.timer(1000, false, parent, run);
+    }
+}