Skip to content
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

Jump to bottom

fix: Set focus to first field in macro popup #2474

Merged
merged 2 commits into from
Mar 4, 2024
Merged

fix: Set focus to first field in macro popup #2474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff3a5f3
fix: Add focus to first field in macro popup
JenWarman Mar 2, 2024
b5a2818
Cleanup
JenWarman Mar 3, 2024
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
4 changes: 4 additions & 0 deletions ugs-core/src/com/willwinder/universalgcodesender/MacroHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ This file is part of Universal Gcode Sender (UGS).
import com.willwinder.universalgcodesender.model.BackendAPI;
import com.willwinder.universalgcodesender.model.Position;
import com.willwinder.universalgcodesender.services.KeyboardService;
import com.willwinder.universalgcodesender.uielements.components.RequestFocusListener;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -166,6 +167,9 @@ private static String parsePrompts(String command) {
myPanel.setLayout(new MigLayout("wrap 2, width 200"));
for (Prompt s : prompts) {
JTextField field = new JTextField(s.defaultValue);
if (fields.size() == 0){
field.addHierarchyListener(new RequestFocusListener());
}
myPanel.add(new JLabel(s.prompt + ":"));
myPanel.add(field, "growx, pushx");
fields.add(field);
Expand Down
32 changes: 32 additions & 0 deletions ...e/src/com/willwinder/universalgcodesender/uielements/components/RequestFocusListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.willwinder.universalgcodesender.uielements.components;

import java.awt.Component;
import java.awt.Window;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.SwingUtilities;

/**
* Used for focusing a field in an JOptionDialog.
*
* Source from: https://tips4java.wordpress.com/2010/03/14/dialog-focus/
*/
public class RequestFocusListener implements HierarchyListener {

@Override
public void hierarchyChanged(HierarchyEvent e) {
final Component c = e.getComponent();
if (c.isShowing() && (e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0) {
Window toplevel = SwingUtilities.getWindowAncestor(c);
toplevel.addWindowFocusListener(new WindowAdapter() {

@Override
public void windowGainedFocus(WindowEvent e) {
c.requestFocus();
}
});
}
}
}
Loading