(hop) branch main updated: Improve Reset/Clear button layout on General configuration tab (#7600)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new ccea73dee7 Improve Reset/Clear button layout on General configuration 
tab (#7600)
ccea73dee7 is described below

commit ccea73dee7fa20fdd9f88a87c5d6bb0856def2a7
Author: Lance <leeh...@gmail.com>
AuthorDate: Fri Jul 24 18:16:23 2026 +0800

    Improve Reset/Clear button layout on General configuration tab (#7600)
    
    Signed-off-by: lance <leeh...@gmail.com>
---
 .../tabs/ConfigGeneralOptionsTab.java              | 36 +++++-----------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git 
a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
 
b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
index 6375f842e9..0beedb8d99 100644
--- 
a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
+++ 
b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigGeneralOptionsTab.java
@@ -614,44 +614,33 @@ public class ConfigGeneralOptionsTab {
   }
 
   /**
-   * Creates a button with image in front and text label behind it (like 
checkboxes).
+   * Creates an action button with icon and text together (Reset / Clear).
    *
    * @param parent The parent composite
-   * @param labelKey The message key for the label text
+   * @param labelKey The message key for the button text
    * @param tooltipKey Optional tooltip message key (can be null)
    * @param lastControl The last control to attach to
    * @param margin The margin to use
-   * @return An array containing [Button, Label] controls
+   * @return An array containing the Button
    */
   private Control[] createButton(
       Composite parent, String labelKey, String tooltipKey, Control 
lastControl, int margin) {
-    // Button with image
     Button button = new Button(parent, SWT.PUSH);
     PropsUi.setLook(button);
+    button.setText(BaseMessages.getString(PKG, labelKey));
 
-    // Try to set image, otherwise use text
-    Image buttonImage = GuiResource.getInstance().getImageResetOption();
+    // Compact icon beside the text (smaller than toolbar SMALL_ICON_SIZE)
+    Image buttonImage = 
GuiResource.getInstance().getImage("ui/images/reset_option.svg", 12, 12);
     if (buttonImage != null) {
       button.setImage(buttonImage);
-      button.setBackground(GuiResource.getInstance().getColorWhite());
-    } else {
-      button.setText(BaseMessages.getString(PKG, 
"EnterOptionsDialog.Button.Reset"));
     }
 
     if (tooltipKey != null) {
       button.setToolTipText(BaseMessages.getString(PKG, tooltipKey));
     }
 
-    // Calculate proper button height based on image and zoom factor
-    int buttonHeight = (int) (32 * PropsUi.getInstance().getZoomFactor());
-    if (buttonImage != null) {
-      // Ensure button is at least as tall as the image with some padding
-      buttonHeight = Math.max(buttonHeight, buttonImage.getBounds().height + 
8);
-    }
-
     FormData fdButton = new FormData();
     fdButton.left = new FormAttachment(0, 0);
-    fdButton.height = buttonHeight;
     if (lastControl != null) {
       fdButton.top = new FormAttachment(lastControl, margin);
     } else {
@@ -659,18 +648,7 @@ public class ConfigGeneralOptionsTab {
     }
     button.setLayoutData(fdButton);
 
-    // Label with text behind the button
-    Label label = new Label(parent, SWT.LEFT);
-    PropsUi.setLook(label);
-    label.setText(BaseMessages.getString(PKG, labelKey));
-
-    FormData fdLabel = new FormData();
-    fdLabel.left = new FormAttachment(button, margin);
-    fdLabel.top = new FormAttachment(button, 0, SWT.CENTER);
-    fdLabel.right = new FormAttachment(100, 0);
-    label.setLayoutData(fdLabel);
-
-    return new Control[] {button, label};
+    return new Control[] {button};
   }
 
   /**