From 2e896de375c44db40e440e606cd4b8f63f8c8feb Mon Sep 17 00:00:00 2001 From: "nboyd%atg.com" Date: Mon, 21 Apr 2003 19:43:45 +0000 Subject: [PATCH] Fix bug 202344 (which was not fully fixed by the previous change.) git-svn-id: svn://10.0.0.236/trunk@141525 18797224-902f-48f8-a5cc-f745e15eee43 --- .../javascript/tools/debugger/Main.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java index 2287f10a966..d9cdf8c780f 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java @@ -432,8 +432,6 @@ class FileTextArea extends JTextArea implements ActionListener, } public void mouseReleased(MouseEvent e) { checkPopup(e); - requestFocus(); - getCaret().setVisible(true); } private void checkPopup(MouseEvent e) { @@ -756,29 +754,39 @@ class FindFunction extends JDialog implements ActionListener { }; class FileHeader extends JPanel implements MouseListener { - + private int pressLine = -1; FileWindow fileWindow; public void mouseEntered(MouseEvent e) { } public void mousePressed(MouseEvent e) { + Font font = fileWindow.textArea.getFont(); + FontMetrics metrics = getFontMetrics(font); + int h = metrics.getHeight(); + pressLine = e.getY() / h; } public void mouseClicked(MouseEvent e) { + } + public void mouseExited(MouseEvent e) { + } + public void mouseReleased(MouseEvent e) { if (e.getComponent() == this && - (e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0) { + (e.getModifiers() & MouseEvent.BUTTON1_MASK) != 0) + { int x = e.getX(); int y = e.getY(); Font font = fileWindow.textArea.getFont(); FontMetrics metrics = getFontMetrics(font); int h = metrics.getHeight(); int line = y/h; - fileWindow.toggleBreakPoint(line + 1); + if (line == pressLine) { + fileWindow.toggleBreakPoint(line + 1); + } + else { + pressLine = -1; + } } } - public void mouseExited(MouseEvent e) { - } - public void mouseReleased(MouseEvent e) { - } FileHeader(FileWindow fileWindow) { this.fileWindow = fileWindow;