Focus the first editor when a dialog shows up

Author: dbarashev

ganttproject/src/main/java/biz/ganttproject/app/PropertySheet.kt

@@ -76,6 +76,7 @@ class PropertyPaneBuilder(private val localizer: Localizer, private val gridPane
   internal val validationErrors = FXCollections.observableMap(mutableMapOf<ObservableProperty<*>, String>())
   internal val isEscCloseEnabled = SimpleBooleanProperty(true)
   internal val rowBuilders = mutableListOf<RowBuilder>()
+  internal var onRequestFocus: (()->Unit)? = null
 
   fun stylesheet(stylesheet: String) {
     gridPane.stylesheets.add(stylesheet)
@@ -139,6 +140,9 @@ class PropertyPaneBuilder(private val localizer: Localizer, private val gridPane
 
   private fun createOptionItem(property: ObservableProperty<*>, editor: Node, options: PropertyDisplayOptions<*>? = null): OptionRowBuilder {
     property.isWritable.addWatcher { evt -> editor.isDisable = !evt.newValue }
+    if (onRequestFocus == null) {
+      onRequestFocus = { editor.requestFocus() }
+    }
     return OptionRowBuilder(property, editor, getOptionLabel(property), options)
   }
 
@@ -472,6 +476,11 @@ class PropertySheetBuilder(private val localizer: Localizer) {
     paneBuilder.rowBuilders.forEachIndexed { _, builder ->
       rowNum = builder.build(gridPane, rowNum) + 1
     }
+    gridPane.focusedProperty().addListener { _, _, newValue ->
+      if (newValue) {
+        paneBuilder.onRequestFocus?.invoke()
+      }
+    }
     return PropertySheet(gridPane, paneBuilder.validationErrors, paneBuilder.isEscCloseEnabled)
   }
 

ganttproject/src/main/java/net/sourceforge/ganttproject/gui/GanttDialogProperties.java

@@ -129,7 +129,7 @@ public Unit invoke(JComponent node, String title) {
       var mainPropertiesPanel = taskPropertiesController.getMainPropertiesPanel();
 
       try {
-        tabbedPane.getTabs().add(new Tab(mainPropertiesPanel.getTitle(), mainPropertiesPanel.getFxNode()));
+        tabbedPane.getTabs().add(new Tab(mainPropertiesPanel.getTitle(), mainPropertiesPanel.getFxComponent()));
       } catch (Exception e) {
         e.printStackTrace();
       }
@@ -155,6 +155,7 @@ public Unit invoke(JComponent node, String title) {
           }
           return null;
         });
+        mainPropertiesPanel.requestFocus();
         dialogController.resize();
         return null;
       }); return null; });

ganttproject/src/main/java/net/sourceforge/ganttproject/gui/taskproperties/MainPropertiesPanel.kt

@@ -47,6 +47,7 @@ import javax.swing.SwingUtilities
 
 class MainPropertiesPanel(private val task: Task, private val taskView: TaskView) {
   val title: String = RootLocalizer.formatText("general")
+  val fxComponent by lazy { getFxNode() }
 
   private val nameOption = ObservableString("name", task.name)
   private val milestoneOption = ObservableBoolean("milestone", task.isMilestone)
@@ -67,6 +68,8 @@ class MainPropertiesPanel(private val task: Task, private val taskView: TaskView
     it.putValue(GPAction.TEXT_DISPLAY, ContentDisplay.TEXT_ONLY)
     it.isEnabled = earliestStartOption.isWritable.value
   }
+  private var onRequestFocus = {}
+
   private fun onHasEarliestStartChange(hasEarliestStart: Boolean) {
     earliestStartOption.setWritable(hasEarliestStart)
     copyStartDateAction.isEnabled = hasEarliestStart
@@ -78,8 +81,8 @@ class MainPropertiesPanel(private val task: Task, private val taskView: TaskView
     onHasEarliestStartChange(hasEarliestStart.value)
   }
 
-  fun getFxNode() = StackPane().apply {
-     background = Background(BackgroundFill("Panel.background".colorFromUiManager(), CornerRadii.EMPTY, Insets.EMPTY))
+  private fun getFxNode() = StackPane().apply {
+    background = Background(BackgroundFill("Panel.background".colorFromUiManager(), CornerRadii.EMPTY, Insets.EMPTY))
     val leftPane = PropertySheetBuilder(i18n).pane {
       stylesheet("/biz/ganttproject/task/TaskPropertiesDialog.css")
       title("section.main")
@@ -134,6 +137,8 @@ class MainPropertiesPanel(private val task: Task, private val taskView: TaskView
         }
       }
     }
+    onRequestFocus = leftPane::requestFocus
+
     val grid = GridPane()
 
     val rightPane = PropertySheetBuilder(i18n).pane {
@@ -200,6 +205,8 @@ class MainPropertiesPanel(private val task: Task, private val taskView: TaskView
       taskMutator.setShape(value.paint)
     }
   }
+
+  fun requestFocus() = onRequestFocus()
 }
 
 private fun Task.canBeMilestone() = this.nestedTasks.isEmpty()