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

toolwindow: optionally do not track last focused component

Browse Source
This commit is contained in:
Kirill Kalishev
2011-04-18 19:33:24 +04:00
parent e3fb17d4ee
commit 1ad6a1b420
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/ex/ToolWindowEx.java
+3
View File
@@ -47,5 +47,8 @@ public interface ToolWindowEx extends ToolWindow {
InternalDecorator getDecorator();
void setUseLastFocusedOnActivation(boolean focus);
boolean isUseLastFocusedOnActivation();
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
+11
View File
@@ -71,6 +71,7 @@ public final class ToolWindowImpl implements ToolWindowEx {
return myComponent != null && myComponent.isShowing();
}
};
private boolean myUseLastFocused = true;
ToolWindowImpl(final ToolWindowManagerImpl toolWindowManager, final String id, boolean canCloseContent, @Nullable final JComponent component) {
myToolWindowManager = toolWindowManager;
@@ -427,4 +428,14 @@ public final class ToolWindowImpl implements ToolWindowEx {
public void showContentPopup(InputEvent inputEvent) {
myContentUI.showContentPopup(inputEvent);
}
@Override
public void setUseLastFocusedOnActivation(boolean focus) {
myUseLastFocused = focus;
}
@Override
public boolean isUseLastFocusedOnActivation() {
return myUseLastFocused;
}
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.wm.FocusWatcher;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
import com.intellij.openapi.wm.ex.ToolWindowEx;
import com.intellij.openapi.wm.impl.FloatingDecorator;
import com.intellij.openapi.wm.impl.ToolWindowImpl;
import com.intellij.openapi.wm.impl.WindowManagerImpl;
@@ -70,7 +71,7 @@ public final class RequestFocusInToolWindowCmd extends FinalizableCommand {
return;
}
Component preferredFocusedComponent = myFocusWatcher.getFocusedComponent();
Component preferredFocusedComponent = myToolWindow.isUseLastFocusedOnActivation() ? myFocusWatcher.getFocusedComponent() : null;
if (preferredFocusedComponent == null && myToolWindow.getContentManager().getSelectedContent() != null) {
preferredFocusedComponent = myToolWindow.getContentManager().getSelectedContent().getPreferredFocusableComponent();