From b04e33f73bdddfef8d8331b4de77f00d79a3699a Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Fri, 1 Dec 2017 21:03:14 +0300 Subject: [PATCH] IDEA-23184 Always on top detachable windows doesn't make sense on MacOS. --- .../src/com/intellij/designer/LightToolWindow.java | 6 ------ .../intellij/ide/actions/ToggleWindowedModeAction.java | 5 ----- .../com/intellij/openapi/wm/impl/InternalDecorator.java | 8 -------- 3 files changed, 19 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java b/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java index 29f2405293d0..00ce27474983 100644 --- a/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java +++ b/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java @@ -465,12 +465,6 @@ public class LightToolWindow extends JPanel { ToggleWindowedModeAction() { super(ToolWindowType.WINDOWED, InternalDecorator.TOGGLE_WINDOWED_MODE_ACTION_ID); } - - @Override - public void update(@NotNull AnActionEvent e) { - super.update(e); - e.getPresentation().setEnabledAndVisible(!SystemInfo.isMac); - } } private class ToggleTypeModeAction extends ToggleAction { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleWindowedModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleWindowedModeAction.java index dddc78e553e0..9b8a631851e9 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleWindowedModeAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleWindowedModeAction.java @@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.ToolWindowType; import com.intellij.openapi.wm.ex.ToolWindowEx; @@ -64,10 +63,6 @@ public class ToggleWindowedModeAction extends ToggleAction implements DumbAware public void update(AnActionEvent event) { super.update(event); Presentation presentation = event.getPresentation(); - if (SystemInfo.isMac) { - presentation.setEnabledAndVisible(false); - return; - } Project project = event.getProject(); if (project == null) { presentation.setEnabled(false); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java index 30ccba492847..64bf3763b769 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java @@ -628,14 +628,6 @@ public final class InternalDecorator extends JPanel implements Queryable, DataPr fireTypeChanged(ToolWindowType.WINDOWED); } } - - @Override - public void update(@NotNull AnActionEvent e) { - super.update(e); - if (SystemInfo.isMac) { - e.getPresentation().setEnabledAndVisible(false); - } - } } private final class ToggleSideModeAction extends ToggleAction implements DumbAware {