[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[25298] plugins/Highlight/trunk/src/gatchan/highlight
From:       kpouer--- via jEdit-CVS <jedit-cvs () lists ! sourceforge ! net>
Date:       2020-04-29 18:53:21
Message-ID: 1588186402.245882.32302 () sfp-scm-2 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

Revision: 25298
          http://sourceforge.net/p/jedit/svn/25298
Author:   kpouer
Date:     2020-04-29 18:53:21 +0000 (Wed, 29 Apr 2020)
Log Message:
-----------
highlight selection also works in other edit panes

Modified Paths:
--------------
    plugins/Highlight/trunk/src/gatchan/highlight/HighlightManager.java
    plugins/Highlight/trunk/src/gatchan/highlight/HighlightManagerTableModel.java
    plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java
    plugins/Highlight/trunk/src/gatchan/highlight/Highlighter.java

Modified: plugins/Highlight/trunk/src/gatchan/highlight/HighlightManager.java
===================================================================
--- plugins/Highlight/trunk/src/gatchan/highlight/HighlightManager.java	2020-04-27 \
                22:15:46 UTC (rev 25297)
+++ plugins/Highlight/trunk/src/gatchan/highlight/HighlightManager.java	2020-04-29 \
18:53:21 UTC (rev 25298) @@ -22,6 +22,7 @@
 package gatchan.highlight;
 
 import org.gjt.sp.jedit.Buffer;
+import org.gjt.sp.jedit.textarea.JEditTextArea;
 
 import javax.swing.event.CaretListener;
 
@@ -33,7 +34,6 @@
  */
 public interface HighlightManager extends CaretListener
 {
-
   /**
    * Add a Highlight listener.
    *
@@ -108,6 +108,8 @@
    */
   void bufferClosed(Buffer buffer);
 
+  void caretUpdate(JEditTextArea textArea);
+
   boolean isHighlightWordAtCaret();
 
   void propertiesChanged();

Modified: plugins/Highlight/trunk/src/gatchan/highlight/HighlightManagerTableModel.java
 ===================================================================
--- plugins/Highlight/trunk/src/gatchan/highlight/HighlightManagerTableModel.java	2020-04-27 \
                22:15:46 UTC (rev 25297)
+++ plugins/Highlight/trunk/src/gatchan/highlight/HighlightManagerTableModel.java	2020-04-29 \
18:53:21 UTC (rev 25298) @@ -590,6 +590,7 @@
 		EventQueue.invokeLater(() -> caretUpdate(textArea));
 	}
 
+	@Override
 	public void caretUpdate(JEditTextArea textArea)
 	{
 		int line = textArea.getCaretLine();

Modified: plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java
===================================================================
--- plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java	2020-04-27 \
                22:15:46 UTC (rev 25297)
+++ plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java	2020-04-29 \
18:53:21 UTC (rev 25298) @@ -273,6 +273,10 @@
 		{
 			uninitView(view);
 		}
+		else if (what == ViewUpdate.EDIT_PANE_CHANGED)
+		{
+			highlightManager.caretUpdate(view.getTextArea());
+		}
 	}
 
 	//{{{ handleEditPaneMessage() method

Modified: plugins/Highlight/trunk/src/gatchan/highlight/Highlighter.java
===================================================================
--- plugins/Highlight/trunk/src/gatchan/highlight/Highlighter.java	2020-04-27 \
                22:15:46 UTC (rev 25297)
+++ plugins/Highlight/trunk/src/gatchan/highlight/Highlighter.java	2020-04-29 \
18:53:21 UTC (rev 25298) @@ -159,7 +159,7 @@
 			highlightManager.releaseLock();
 		}
 		tempLineContent = lineContent;
-		if (textArea.getSelectionCount() == 0)
+		if (jEdit.getActiveView().getTextArea().getSelectionCount() == 0)
 		{
 			highlight(HighlightManagerTableModel.currentWordHighlight, buffer, gfx, \
physicalLine, y,  screenToPhysicalOffset, tempLineContent);

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.



_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]