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

Escape cancels editor tab drag

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-02-03 19:32:38 +01:00
parent 700f0d8ea2
commit 8e5dcb7d80
7 changed files with 89 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+6
View File
@@ -1606,6 +1606,12 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
mySession.process(event);
mySession = null;
}
@Override
public void dragOutCancelled(TabInfo source) {
mySession.cancel();
mySession = null;
}
}
class DockableGrid implements DockableContent<List<Content>> {
platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
+45 -6
View File
@@ -26,11 +26,12 @@ import com.intellij.util.ui.update.UiNotifyConnector;
import javax.swing.*;
import java.awt.*;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
public abstract class MouseDragHelper implements MouseListener, MouseMotionListener {
public abstract class MouseDragHelper implements MouseListener, MouseMotionListener, KeyEventDispatcher {
public static final int DRAG_START_DEADZONE = 7;
@@ -47,6 +48,7 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
private boolean myDetachPostponed;
private boolean myDetachingMode;
private boolean myCancelled;
public MouseDragHelper(Disposable parent, final JComponent dragComponent) {
myDragComponent = dragComponent;
@@ -82,6 +84,13 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
myGlassPane = IdeGlassPaneUtil.find(myDragComponent);
myGlassPane.addMousePreprocessor(this, myParentDisposable);
myGlassPane.addMouseMotionPreprocessor(this, myParentDisposable);
KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this);
Disposer.register(myParentDisposable, new Disposable() {
@Override
public void dispose() {
KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(MouseDragHelper.this);
}
});
}
public void stop() {
@@ -96,6 +105,7 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
if (myGlassPane != null) {
myGlassPane.removeMousePreprocessor(this);
myGlassPane.removeMouseMotionPreprocessor(this);
KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this);
myGlassPane = null;
}
}
@@ -115,6 +125,10 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
}
public void mouseReleased(final MouseEvent e) {
if (myCancelled) {
myCancelled = false;
return;
}
boolean wasDragging = myDraggingNow;
myPressPointScreen = null;
myDraggingNow = false;
@@ -129,10 +143,7 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
}
}
finally {
myDraggingNow = false;
myPressPointComponent = null;
myPressPointScreen = null;
myDetachingMode = false;
resetDragState();
e.consume();
if (myDetachPostponed) {
myDetachPostponed = false;
@@ -142,8 +153,16 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
}
}
private void resetDragState() {
myDraggingNow = false;
myDragJustStarted = false;
myPressPointComponent = null;
myPressPointScreen = null;
myDetachingMode = false;
}
public void mouseDragged(final MouseEvent e) {
if (myPressPointScreen == null) return;
if (myPressPointScreen == null || myCancelled) return;
final boolean deadZone = isWithinDeadZone(e);
if (!myDraggingNow && !deadZone) {
@@ -190,6 +209,8 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
return true;
}
protected void processDragCancel() {
}
protected void processDragFinish(final MouseEvent event, boolean willDragOutStart) {
}
@@ -197,6 +218,9 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
protected void processDragOutFinish(final MouseEvent event) {
}
protected void processDragOutCancel() {
}
public final boolean isDragJustStarted() {
return myDragJustStarted;
}
@@ -229,4 +253,19 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
public void mouseMoved(final MouseEvent e) {
}
@Override
public boolean dispatchKeyEvent(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ESCAPE && e.getID() == KeyEvent.KEY_PRESSED) {
myCancelled = true;
if (myDetachingMode) {
processDragOutCancel();
}
else {
processDragCancel();
}
resetDragState();
return true;
}
return false;
}
}
platform/platform-api/src/com/intellij/ui/docking/DragSession.java
+1
View File
@@ -20,5 +20,6 @@ import java.awt.event.MouseEvent;
public interface DragSession {
void process(MouseEvent e);
void cancel();
}
platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
+1
View File
@@ -376,6 +376,7 @@ public final class TabInfo implements Queryable, PlaceProvider<String> {
void dragOutStarted(MouseEvent mouseEvent, TabInfo info);
void processDragOut(MouseEvent event, TabInfo source);
void dragOutFinished(MouseEvent event, TabInfo source);
void dragOutCancelled(TabInfo source);
}
}
platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java
+14
View File
@@ -76,6 +76,11 @@ class DragHelper extends MouseDragHelper {
myDragOutSource.getDragOutDelegate().dragOutFinished(event, myDragOutSource);
}
@Override
protected void processDragOutCancel() {
myDragOutSource.getDragOutDelegate().dragOutCancelled(myDragOutSource);
}
protected void processDrag(MouseEvent event, Point targetScreenPoint, Point startPointScreen) {
if (!myTabs.isTabDraggingEnabled()) return;
@@ -245,6 +250,10 @@ class DragHelper extends MouseDragHelper {
protected void processDragFinish(MouseEvent event, boolean willDragOutStart) {
super.processDragFinish(event, willDragOutStart);
endDrag(willDragOutStart);
}
private void endDrag(boolean willDragOutStart) {
if (willDragOutStart) {
myDragOutSource = myDragSource;
}
@@ -261,6 +270,11 @@ class DragHelper extends MouseDragHelper {
myTabs.revalidate();
}
@Override
protected void processDragCancel() {
endDrag(false);
}
public TabInfo getDragSource() {
return myDragSource;
}
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
+11
View File
@@ -581,6 +581,17 @@ final class EditorTabbedContainer implements Disposable, CloseAction.CloseTarget
mySession = null;
}
@Override
public void dragOutCancelled(TabInfo source) {
source.setHidden(false);
if (mySession != null) {
mySession.cancel();
}
myFile = null;
mySession = null;
}
class DockableEditor implements DockableContent<VirtualFile> {
final Image myImg;
private DockableEditorTabbedContainer myContainer;
platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
+11 -6
View File
@@ -168,7 +168,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
if (each.isEmpty() && each.isDisposeWhenEmpty()) {
DockWindow window = myWindows.getValue(each);
if (window != null) {
window.setTransparrent(true);
window.setTransparent(true);
}
}
}
@@ -178,9 +178,9 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
}
private void stopCurrentDragSession() {
public void stopCurrentDragSession() {
if (myCurrentDragSession != null) {
myCurrentDragSession.cancel();
myCurrentDragSession.cancelSession();
myCurrentDragSession = null;
myBusyObject.onReady();
@@ -188,7 +188,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
if (!each.isEmpty()) {
DockWindow window = myWindows.getValue(each);
if (window != null) {
window.setTransparrent(false);
window.setTransparent(false);
}
}
}
@@ -325,7 +325,12 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
}
}
@Override
public void cancel() {
stopCurrentDragSession();
}
private void cancelSession() {
myWindow.dispose();
if (myCurrentOverContainer != null) {
@@ -512,8 +517,8 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
myNorthPanel.repaint();
}
public void setTransparrent(boolean transparrent) {
if (transparrent) {
public void setTransparent(boolean transparent) {
if (transparent) {
WindowManagerEx.getInstanceEx().setAlphaModeEnabled(getFrame(), true);
WindowManagerEx.getInstanceEx().setAlphaModeRatio(getFrame(), 0.5f);
} else {