Skip to content

Fix #5019: revalidate lightweight Picker after shortcut button action #5020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shai-almog merged 1 commit into from
May 24, 2026
+25 −9
Merged

Fix #5019: revalidate lightweight Picker after shortcut button action #5020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions CodenameOne/src/com/codename1/ui/spinner/Picker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,18 +192,33 @@ private LightweightPopupButton(String text, Runnable action, int placement, int

/// Listener fired when a custom popup button is pressed. Static (rather than an anonymous
/// inner class) so it does not retain a reference to the enclosing `Picker`; the only
/// state it needs is the matching `LightweightPopupButton` whose `action` it invokes.
/// state it needs is the matching `LightweightPopupButton` whose `action` it invokes
/// and the spinner `Component` to refresh after the action runs. The spinner reference
/// is dropped along with the popup dialog so it does not outlive the editing session.
private static final class PopupButtonActionListener implements ActionListener {
private final LightweightPopupButton popupButton;
private final Container spinnerContainer;

private PopupButtonActionListener(LightweightPopupButton popupButton) {
private PopupButtonActionListener(LightweightPopupButton popupButton, Container spinnerContainer) {
this.popupButton = popupButton;
this.spinnerContainer = spinnerContainer;
}

@Override
public void actionPerformed(ActionEvent evt) {
if (popupButton.action != null) {
popupButton.action.run();
if (popupButton.action == null) {
return;
}
popupButton.action.run();
// Force a layout + repaint of the spinner so a setDate / setTime /
// setSelectedString / setDuration call inside the action propagates
// to the visible wheels. Spinner3D.setModel only flags the scroller
// as needing a new preferred size; on Android nothing else triggers
// the relayout, so the wheels stay stale until the user touches
// them. Issue #5019.
if (spinnerContainer != null) {
spinnerContainer.revalidate();
spinnerContainer.repaint();
}
}
}
Expand Down Expand Up @@ -727,8 +742,9 @@ protected void deinitialize() {
.setBgTransparency(0)
.setMargin(0)
.setPaddingMillimeters(3f, 0);
Container topCustomButtons = createLightweightPopupButtonRow(LightweightPopupButtonPlacement.ABOVE_SPINNER, isTablet);
Container bottomCustomButtons = createLightweightPopupButtonRow(LightweightPopupButtonPlacement.BELOW_SPINNER, isTablet);
final Container spinnerContainer = spinnerC instanceof Container ? (Container) spinnerC : null;
Container topCustomButtons = createLightweightPopupButtonRow(LightweightPopupButtonPlacement.ABOVE_SPINNER, isTablet, spinnerContainer);
Container bottomCustomButtons = createLightweightPopupButtonRow(LightweightPopupButtonPlacement.BELOW_SPINNER, isTablet, spinnerContainer);
if (topCustomButtons != null || bottomCustomButtons != null) {
Container spinnerSection = new Container(new BorderLayout());
spinnerSection.add(BorderLayout.CENTER, wrapper);
Expand Down Expand Up @@ -824,7 +840,7 @@ public void actionPerformed(ActionEvent evt) {
west.add(nextButton);
}

Container centerButtons = createLightweightPopupButtonRow(LightweightPopupButtonPlacement.BETWEEN_CANCEL_AND_DONE, isTablet);
Container centerButtons = createLightweightPopupButtonRow(LightweightPopupButtonPlacement.BETWEEN_CANCEL_AND_DONE, isTablet, spinnerContainer);
Container buttonBar = BorderLayout.centerEastWest(centerButtons, doneButton, west);
buttonBar.setUIID(isTablet ? "PickerButtonBarTablet" : "PickerButtonBar");
dlg.getContentPane().add(BorderLayout.NORTH, buttonBar);
Expand Down Expand Up @@ -898,7 +914,7 @@ public void actionPerformed(ActionEvent evt) {
updateValue();
}

private Container createLightweightPopupButtonRow(int placement, boolean isTablet) {
private Container createLightweightPopupButtonRow(int placement, boolean isTablet, Container spinnerContainer) {
Container left = null;
Container center = null;
Container right = null;
Expand All @@ -907,7 +923,7 @@ private Container createLightweightPopupButtonRow(int placement, boolean isTable
continue;
}
Button button = new Button(entry.text, isTablet ? "PickerButtonTablet" : "PickerButton");
button.addActionListener(new PopupButtonActionListener(entry));
button.addActionListener(new PopupButtonActionListener(entry, spinnerContainer));
switch (entry.alignment) {
case Component.CENTER:
if (center == null) {
Expand Down
Loading