From 633411613f0692e9c6858cadcd419eb3f5424232 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Fri, 22 Jun 2018 00:04:30 +0300
Subject: [PATCH] SQL editor: side toolbar UI fix

---
 .../jkiss/dbeaver/ui/editors/sql/SQLEditor.java   | 15 +++++++++++++--
 .../dbeaver/ui/editors/sql/SQLEditorBase.java     |  8 ++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
index 8e02771e7b..32483cb05b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
@@ -45,6 +45,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.*;
 import org.eclipse.ui.actions.CompoundContributionItem;
@@ -142,6 +143,7 @@ public class SQLEditor extends SQLEditorBase implements
     private static Image IMG_OUTPUT_ALERT = DBeaverIcons.getImage(UIIcon.SQL_PAGE_OUTPUT_ALERT);
 
     private static final String TOOLBAR_CONTRIBUTION_ID = "toolbar:org.jkiss.dbeaver.ui.editors.sql.toolbar.side";
+    private static final String TOOLBAR_GROUP_TOP = "top";
     private static final String TOOLBAR_GROUP_ADDITIONS = IWorkbenchActionConstants.MB_ADDITIONS;
 
     public static final String VAR_CONNECTION_NAME = "connectionName";
@@ -561,7 +563,17 @@ public class SQLEditor extends SQLEditorBase implements
     }
 
     private void createSideBar(Composite sqlEditorPanel) {
+        Composite ph = new Composite(sqlEditorPanel, SWT.NONE);
+        ph.setLayoutData(new GridData(GridData.FILL_VERTICAL));
+        GridLayout layout = new GridLayout(1, false);
+        layout.horizontalSpacing = 0;
+        layout.verticalSpacing = 0;
+        layout.marginWidth = 3;
+        layout.marginHeight = 3;
+        ph.setLayout(layout);
+
         sideToolBar = new ToolBarManager(SWT.VERTICAL);
+        sideToolBar.add(new Separator(TOOLBAR_GROUP_TOP));
         sideToolBar.add(ActionUtils.makeCommandContribution(getSite(), CoreCommands.CMD_EXECUTE_STATEMENT));
         sideToolBar.add(ActionUtils.makeCommandContribution(getSite(), CoreCommands.CMD_EXECUTE_STATEMENT_NEW));
         sideToolBar.add(ActionUtils.makeCommandContribution(getSite(), CoreCommands.CMD_EXECUTE_SCRIPT));
@@ -577,9 +589,8 @@ public class SQLEditor extends SQLEditorBase implements
         }
         sideToolBar.update(true);
 
-        ToolBar toolBar = sideToolBar.createControl(sqlEditorPanel);
+        ToolBar toolBar = sideToolBar.createControl(ph);
         GridData gd = new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING);
-        gd.verticalIndent = 5;
         toolBar.setLayoutData(gd);
     }
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
index b0d458b303..7c7ec2f0fc 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
@@ -283,6 +283,14 @@ public abstract class SQLEditorBase extends BaseTextEditor implements IErrorVisu
         super.updatePartControl(input);
     }
 
+    protected IOverviewRuler createOverviewRuler(ISharedTextColors sharedColors) {
+        if (isOverviewRulerVisible()) {
+            return super.createOverviewRuler(sharedColors);
+        } else {
+            return new OverviewRuler(getAnnotationAccess(), 0, sharedColors);
+        }
+    }
+
     @Override
     protected boolean isOverviewRulerVisible() {
         return false;
-- 
GitLab