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 eb210505e8 move bottom toolbar a bit, fixes #6635 (#6686)
eb210505e8 is described below

commit eb210505e8c0cc87c8d713f6a3bc7cbfd83fce18
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Sat Feb 28 13:50:02 2026 +0100

    move bottom toolbar a bit, fixes #6635 (#6686)
---
 .../misc/git/src/main/java/org/apache/hop/git/GitGuiPlugin.java   | 3 ++-
 .../main/java/org/apache/hop/projects/gui/ProjectsGuiPlugin.java  | 8 ++++++--
 ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java             | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/plugins/misc/git/src/main/java/org/apache/hop/git/GitGuiPlugin.java 
b/plugins/misc/git/src/main/java/org/apache/hop/git/GitGuiPlugin.java
index 5540edea47..d1905ca983 100644
--- a/plugins/misc/git/src/main/java/org/apache/hop/git/GitGuiPlugin.java
+++ b/plugins/misc/git/src/main/java/org/apache/hop/git/GitGuiPlugin.java
@@ -349,7 +349,8 @@ public class GitGuiPlugin
     Control control = statusWidgets.getWidgetsMap().get(ID_TOOLBAR_ITEM_GIT);
     if (control != null && !control.isDisposed()) {
       Rectangle rect = control.getBounds();
-      Point pt = control.getParent().toDisplay(new Point(rect.x, rect.y + 
rect.height));
+      int menuGap = 6;
+      Point pt = control.getParent().toDisplay(new Point(rect.x, rect.y + 
rect.height + menuGap));
       Menu menu = createGitContextMenu();
       menu.setLocation(pt);
       menu.setVisible(true);
diff --git 
a/plugins/misc/projects/src/main/java/org/apache/hop/projects/gui/ProjectsGuiPlugin.java
 
b/plugins/misc/projects/src/main/java/org/apache/hop/projects/gui/ProjectsGuiPlugin.java
index 50b08d74b7..44e5360658 100644
--- 
a/plugins/misc/projects/src/main/java/org/apache/hop/projects/gui/ProjectsGuiPlugin.java
+++ 
b/plugins/misc/projects/src/main/java/org/apache/hop/projects/gui/ProjectsGuiPlugin.java
@@ -637,7 +637,9 @@ public class ProjectsGuiPlugin {
         
HopGui.getInstance().getStatusToolbarWidgets().getControlForMenu(ID_TOOLBAR_ITEM_PROJECT);
     if (control != null && !control.isDisposed()) {
       Rectangle rect = control.getBounds();
-      Point location = control.getParent().toDisplay(new Point(rect.x, rect.y 
+ rect.height));
+      int menuGap = 6;
+      Point location =
+          control.getParent().toDisplay(new Point(rect.x, rect.y + rect.height 
+ menuGap));
       Menu menu = createProjectContextMenu();
       menu.setLocation(location);
       menu.setVisible(true);
@@ -765,7 +767,9 @@ public class ProjectsGuiPlugin {
             .getControlForMenu(ID_TOOLBAR_ITEM_ENVIRONMENT);
     if (control != null && !control.isDisposed()) {
       Rectangle rect = control.getBounds();
-      Point location = control.getParent().toDisplay(new Point(rect.x, rect.y 
+ rect.height));
+      int menuGap = 6;
+      Point location =
+          control.getParent().toDisplay(new Point(rect.x, rect.y + rect.height 
+ menuGap));
       Menu menu = createEnvironmentContextMenu();
       menu.setLocation(location);
       menu.setVisible(true);
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java 
b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
index c1961154fd..e5947a1515 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
@@ -1514,7 +1514,8 @@ public class HopGui
         ToolbarFacade.createToolbarContainer(shell, SWT.WRAP | SWT.RIGHT | 
SWT.HORIZONTAL);
     statusToolbar = statusToolbarContainer.getControl();
     FormData fdToolBar = new FormData();
-    fdToolBar.left = new FormAttachment(0, 10);
+    int sidebarWidth = (int) (40 * PropsUi.getNativeZoomFactor());
+    fdToolBar.left = new FormAttachment(0, sidebarWidth);
     fdToolBar.right = new FormAttachment(100, 0);
     fdToolBar.bottom = new FormAttachment(100, 0);
     statusToolbar.setLayoutData(fdToolBar);

Reply via email to