MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

New tabs UI: There is no border between database console/table editor and Toolbar/Navigation bar when tabs are hidden (#IDEA-214996)

Browse Source 
GitOrigin-RevId: 960f41f1d983f62312f3c7a710606a11d9e4da1f
This commit is contained in:
graann
2019-05-27 14:12:13 +03:00
committed by intellij-monorepo-bot
parent cba68688b7
commit b67873510a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorHeaderComponent.java
+14 -9
View File
@@ -43,23 +43,28 @@ public class EditorHeaderComponent extends JPanel implements UISettingsListener
@Override
public void uiSettingsChanged(UISettings uiSettings) {
if(JBTabsFactory.getUseNewTabs()) {
setBorder(new CustomLineBorder(JBColor.border(), 0, 0, 1, 0));
} else {
boolean topBorderRequired = uiSettings.getEditorTabPlacement() != SwingConstants.TOP &&
(uiSettings.getShowNavigationBar() || uiSettings.getShowMainToolbar());
setBorder(new CustomLineBorder(JBColor.border(), topBorderRequired ? 1 : 0, 0, 1, 0));
boolean topBorderRequired = uiSettings.getShowNavigationBar() || uiSettings.getShowMainToolbar();
if (JBTabsFactory.getUseNewTabs()) {
topBorderRequired = uiSettings.getEditorTabPlacement() == 0 && topBorderRequired;
}
else {
topBorderRequired = uiSettings.getEditorTabPlacement() != SwingConstants.TOP;
}
setBorder(new CustomLineBorder(JBColor.border(), topBorderRequired ? 1 : 0, 0, 1, 0));
}
@Override
public Dimension getPreferredSize() {
if(JBTabsFactory.getUseNewTabs()) {
if (JBTabsFactory.getUseNewTabs()) {
Dimension size = super.getPreferredSize();
Insets insets = getInsets();
int tabsHeight = TabsHeightController.getToolWindowHeight() - insets.top - insets.bottom;
int offset = UISettings.getInstance().getEditorTabPlacement() == 0 ? 0 : insets.top + insets.bottom;
int tabsHeight = TabsHeightController.getToolWindowHeight() - offset;
return tabsHeight > size.height ? new Dimension(size.width, tabsHeight) : size;
} else {
}
else {
return super.getPreferredSize();
}
}