diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index 816349ed1c37..6c13964d5789 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -111,7 +111,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom protected MyNode myRoot = new MyRootNode(); protected Tree myTree = new Tree(); - private final DetailsComponent myDetails = new DetailsComponent(); + private final DetailsComponent myDetails = new DetailsComponent(!Registry.is("ide.new.project.settings"), !Registry.is("ide.new.project.settings")); protected JPanel myWholePanel; public JPanel myNorthPanel = new JPanel(new BorderLayout()); @@ -131,12 +131,9 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom protected MasterDetailsComponent(MasterDetailsState state) { myState = state; - mySplitter = new JBSplitter(false, .2f); + mySplitter = Registry.is("ide.new.project.settings") ? new OnePixelSplitter(false, .2f) : new JBSplitter(false, .2f); mySplitter.setSplitterProportionKey("ProjectStructure.SecondLevelElements"); mySplitter.setHonorComponentsMinimumSize(true); - if (Registry.is("ide.new.project.settings")) { - mySplitter.setOnePixelMode(); - } installAutoScroll(); reInitWholePanelIfNeeded(); @@ -300,6 +297,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom @NotNull public JComponent createComponent() { + myTree.updateUI(); reInitWholePanelIfNeeded(); updateSelectionFromTree(); @@ -962,7 +960,11 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom myPreselection != null ? myPreselection.getDefaultIndex() : 0, true); final ListPopup listPopup = popupFactory.createListPopup(step); listPopup.setHandleAutoSelectionBeforeShow(true); - listPopup.showUnderneathOf(myNorthPanel); + if (e instanceof AnActionButton.AnActionEventWrapper) { + ((AnActionButton.AnActionEventWrapper)e).showPopup(listPopup); + } else { + listPopup.showUnderneathOf(myNorthPanel); + } } } |