From fa68ab3315d17dadb40fc2b756485e8cb21b0398 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sun, 16 Nov 2014 14:46:28 +0100 Subject: [PATCH] use TabbedContentLabel for TabbedContent --- .../openapi/wm/impl/content/TabContentLayout.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/TabContentLayout.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/TabContentLayout.java index 62246de04248..e2bc60e1cf30 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/TabContentLayout.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/TabContentLayout.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.ui.awt.RelativeRectangle; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; import com.intellij.ui.content.ContentManagerEvent; +import com.intellij.ui.content.TabbedContent; import com.intellij.util.ui.BaseButtonBehavior; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -438,9 +439,15 @@ class TabContentLayout extends ContentLayout { @Override public void contentAdded(ContentManagerEvent event) { - final ContentTabLabel tab = new ContentTabLabel(event.getContent(), this); + final Content content = event.getContent(); + final ContentTabLabel tab; + if (content instanceof TabbedContent) { + tab = new TabbedContentTabLabel((TabbedContent)content, this); + } else { + tab = new ContentTabLabel(content, this); + } myTabs.add(event.getIndex(), tab); - myContent2Tabs.put(event.getContent(), tab); + myContent2Tabs.put(content, tab); myCached.clear(); }