提交 1ca61804 编写于 作者: S serge-rider

SQL editor layout fix

上级 e7e0f386
...@@ -163,6 +163,7 @@ public class SQLEditor extends SQLEditorBase implements ...@@ -163,6 +163,7 @@ public class SQLEditor extends SQLEditorBase implements
private ResultSetOrientation resultSetOrientation = ResultSetOrientation.HORIZONTAL; private ResultSetOrientation resultSetOrientation = ResultSetOrientation.HORIZONTAL;
private CustomSashForm resultsSash; private CustomSashForm resultsSash;
private Composite sqlEditorPanel;
@Nullable @Nullable
private CustomSashForm presentationSash; private CustomSashForm presentationSash;
private CTabFolder resultTabs; private CTabFolder resultTabs;
...@@ -508,7 +509,7 @@ public class SQLEditor extends SQLEditorBase implements ...@@ -508,7 +509,7 @@ public class SQLEditor extends SQLEditorBase implements
UIUtils.setHelp(resultsSash, IHelpContextIds.CTX_SQL_EDITOR); UIUtils.setHelp(resultsSash, IHelpContextIds.CTX_SQL_EDITOR);
Composite editorContainer; Composite editorContainer;
Composite sqlEditorPanel = UIUtils.createPlaceholder(resultsSash, 2, 0); sqlEditorPanel = UIUtils.createPlaceholder(resultsSash, 2, 0);
createSideBar(sqlEditorPanel); createSideBar(sqlEditorPanel);
// divides SQL editor presentations // divides SQL editor presentations
...@@ -517,7 +518,7 @@ public class SQLEditor extends SQLEditorBase implements ...@@ -517,7 +518,7 @@ public class SQLEditor extends SQLEditorBase implements
if (extraPresentationDescriptor != null) { if (extraPresentationDescriptor != null) {
presentationSash = UIUtils.createPartDivider( presentationSash = UIUtils.createPartDivider(
this, this,
sqlEditorPanel, sqlEditorPanel,
((resultSetOrientation.getSashOrientation() == SWT.VERTICAL) ? SWT.HORIZONTAL : SWT.VERTICAL) | SWT.SMOOTH); ((resultSetOrientation.getSashOrientation() == SWT.VERTICAL) ? SWT.HORIZONTAL : SWT.VERTICAL) | SWT.SMOOTH);
presentationSash.setSashWidth(5); presentationSash.setSashWidth(5);
presentationSash.setLayoutData(new GridData(GridData.FILL_BOTH)); presentationSash.setLayoutData(new GridData(GridData.FILL_BOTH));
...@@ -929,7 +930,7 @@ public class SQLEditor extends SQLEditorBase implements ...@@ -929,7 +930,7 @@ public class SQLEditor extends SQLEditorBase implements
public void toggleResultPanel() { public void toggleResultPanel() {
if (resultsSash.getMaximizedControl() == null) { if (resultsSash.getMaximizedControl() == null) {
resultsSash.setMaximizedControl(resultsSash.getChildren()[0]); resultsSash.setMaximizedControl(sqlEditorPanel);
switchFocus(false); switchFocus(false);
} else { } else {
resultsSash.setMaximizedControl(null); resultsSash.setMaximizedControl(null);
...@@ -1513,7 +1514,7 @@ public class SQLEditor extends SQLEditorBase implements ...@@ -1513,7 +1514,7 @@ public class SQLEditor extends SQLEditorBase implements
reloadSyntaxRules(); reloadSyntaxRules();
if (getDataSourceContainer() == null) { if (getDataSourceContainer() == null) {
resultsSash.setMaximizedControl(getEditorControlWrapper()); resultsSash.setMaximizedControl(sqlEditorPanel);
} else { } else {
resultsSash.setMaximizedControl(null); resultsSash.setMaximizedControl(null);
} }
...@@ -2450,7 +2451,7 @@ public class SQLEditor extends SQLEditorBase implements ...@@ -2450,7 +2451,7 @@ public class SQLEditor extends SQLEditorBase implements
return; return;
} }
if (getActivePreferenceStore().getBoolean(SQLPreferenceConstants.MAXIMIZE_EDITOR_ON_SCRIPT_EXECUTE)) { if (getActivePreferenceStore().getBoolean(SQLPreferenceConstants.MAXIMIZE_EDITOR_ON_SCRIPT_EXECUTE)) {
resultsSash.setMaximizedControl(getEditorControlWrapper()); resultsSash.setMaximizedControl(sqlEditorPanel);
} }
}); });
} finally { } finally {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册