Object editor lazy initializing UI fix

plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/ProgressEditorPart.java

@@ -18,7 +18,6 @@ package org.jkiss.dbeaver.ui.editors;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
@@ -40,7 +39,7 @@ public class ProgressEditorPart extends EditorPart {
 
     private final IDatabaseEditor ownerEditor;
     private Composite parentControl;
-    private Canvas progressCanvas;
+    private Composite progressCanvas;
 
     public ProgressEditorPart(IDatabaseEditor ownerEditor) {
         this.ownerEditor = ownerEditor;
@@ -90,7 +89,7 @@ public class ProgressEditorPart extends EditorPart {
     }
 
     private void createProgressPane(final Composite parent) {
-        progressCanvas = new Canvas(parent, SWT.NONE);
+        progressCanvas = new Composite(parent, SWT.NONE);
         progressCanvas.addPaintListener(e ->
             e.gc.drawText("Opening editor '" + getEditorInput().getName() + "'...", 5, 5, true));
 

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java

@@ -26,7 +26,9 @@ import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
@@ -529,8 +531,10 @@ public class EntityEditor extends MultiPageDatabaseEditor
             try {
                 addPage(new ProgressEditorPart(this), editorInput);
                 setPageText(0, "Initializing ...");
-                setPageImage(0, DBeaverIcons.getImage(UIIcon.REFRESH));
+                Image tabImage = DBeaverIcons.getImage(UIIcon.REFRESH);
+                setPageImage(0, tabImage);
                 setActivePage(0);
+                ((CTabFolder)getContainer()).setTabHeight(tabImage.getBounds().height + 2);
             } catch (PartInitException e) {
                 log.error(e);
             }