[ jEdit-commits ] SF.net SVN: jedit:[13802] jEdit/trunk/org/gjt/sp/jedit/textarea/Gutter.java

[<sh...@us...>]

Revision: 13802
          http://jedit.svn.sourceforge.net/jedit/?rev=13802&view=rev
Author:   shlomy
Date:     2008-09-25 22:35:08 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
Give structure scope indicators priority over the fold middle in the gutter.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/textarea/Gutter.java

Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/Gutter.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/Gutter.java	2008-09-25 22:25:01 UTC (rev 13801)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/Gutter.java	2008-09-25 22:35:08 UTC (rev 13802)
@@ -572,22 +572,20 @@
 		if(physicalLine == -1)
 			return;
 
-		//{{{ Paint fold triangles
+		boolean drawFoldMiddle = true;
+		//{{{ Paint fold start and end indicators
 		if(info.firstSubregion && buffer.isFoldStart(physicalLine))
 		{
+			drawFoldMiddle = false;
 			foldPainter.paintFoldStart(this, gfx, line, physicalLine,
 					textArea.displayManager.isLineVisible(physicalLine+1),
 					y, lineHeight, buffer);
 		}
 		else if(info.lastSubregion && buffer.isFoldEnd(physicalLine))
 		{
+			drawFoldMiddle = false;
 			foldPainter.paintFoldEnd(this, gfx, line, physicalLine, y,
 					lineHeight, buffer);
-		}
-		else if(buffer.getFoldLevel(physicalLine) > 0)
-		{
-			foldPainter.paintFoldMiddle(this, gfx, line, physicalLine,
-					y, lineHeight, buffer);
 		} //}}}
 		//{{{ Paint bracket scope
 		else if(structureHighlight)
@@ -637,9 +635,11 @@
 				}
 
 				gfx.setColor(structureHighlightColor);
+				drawFoldMiddle = false;
 				if(structScreenLine == caretScreenLine)
 				{
 					// do nothing
+					drawFoldMiddle = true;
 				}
 				// draw |^
 				else if(line == caretScreenLine)
@@ -678,6 +678,11 @@
 				}
 			}
 		} //}}}
+		if(drawFoldMiddle && buffer.getFoldLevel(physicalLine) > 0)
+		{
+			foldPainter.paintFoldMiddle(this, gfx, line, physicalLine,
+					y, lineHeight, buffer);
+		}
 
 		//{{{ Paint line numbers
 		if(info.firstSubregion && expanded)


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