diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java index ddfc1a3989aa..560082bf9e64 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java @@ -116,12 +116,17 @@ public class PinActiveTabAction extends ToggleAction implements DumbAware { super.update(e); Presentation presentation = e.getPresentation(); DataContext context = e.getDataContext(); - if (getFile(context) != null) { - presentation.setEnabledAndVisible(true); - } - else { - Content content = getContent(context); - presentation.setEnabledAndVisible(content != null && content.isPinnable()); + EditorWindow window = getEditorWindow(context); + if (window == null || window.getOwner().isPreview()) { + presentation.setEnabledAndVisible(false); + } else { + if (getFile(context) != null) { + presentation.setEnabledAndVisible(true); + } + else { + Content content = getContent(context); + presentation.setEnabledAndVisible(content != null && content.isPinnable()); + } } if (ActionPlaces.EDITOR_TAB_POPUP.equals(e.getPlace()) || ViewContext.CELL_POPUP_PLACE.equals(e.getPlace())) { |