# HG changeset patch
# User wenzelm
# Date 1283886418 -7200
# Node ID b8fdd3ae881536a113b99976525e407cdab5b0bf
# Parent  a08d68e993ea885dbbf03fee538ccef2a0719fba
Document_View: more precise painting of gutter icons, only if line selection area is sufficiently large;

diff -r a08d68e993ea -r b8fdd3ae8815 src/Tools/jEdit/dist-template/properties/jedit.props
--- a/src/Tools/jEdit/dist-template/properties/jedit.props	Tue Sep 07 18:44:28 2010 +0200
+++ b/src/Tools/jEdit/dist-template/properties/jedit.props	Tue Sep 07 21:06:58 2010 +0200
@@ -203,6 +203,7 @@
 view.fontsize=18
 view.fracFontMetrics=false
 view.gutter.fontsize=12
+view.gutter.selectionAreaWidth=18
 view.height=787
 view.middleMousePaste=true
 view.showToolbar=false
diff -r a08d68e993ea -r b8fdd3ae8815 src/Tools/jEdit/src/jedit/document_view.scala
--- a/src/Tools/jEdit/src/jedit/document_view.scala	Tue Sep 07 18:44:28 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/document_view.scala	Tue Sep 07 21:06:58 2010 +0200
@@ -17,8 +17,9 @@
 import javax.swing.{JPanel, ToolTipManager}
 import javax.swing.event.{CaretListener, CaretEvent}
 
-import org.gjt.sp.jedit.{GUIUtilities, OperatingSystem}
+import org.gjt.sp.jedit.{jEdit, GUIUtilities, OperatingSystem}
 import org.gjt.sp.jedit.gui.RolloverButton
+import org.gjt.sp.jedit.options.GutterOptionPane
 import org.gjt.sp.jedit.textarea.{JEditTextArea, TextArea, TextAreaExtension, TextAreaPainter}
 import org.gjt.sp.jedit.syntax.SyntaxStyle
 
@@ -31,8 +32,8 @@
   val unfinished_color = new Color(255, 228, 225)
 
   val regular_color = new Color(192, 192, 192)
-  val warning_color = new Color(255, 165, 0)
-  val error_color = new Color(255, 106, 106)
+  val warning_color = new Color(255, 168, 0)
+  val error_color = new Color(255, 80, 80)
   val bad_color = new Color(255, 204, 153, 100)
 
   val warning_icon = GUIUtilities.loadIcon("16x16/status/dialog-warning.png")
@@ -364,17 +365,21 @@
       first_line: Int, last_line: Int, physical_lines: Array[Int],
       start: Array[Int], end: Array[Int], y: Int, line_height: Int)
     {
-      Isabelle.swing_buffer_lock(model.buffer) {
-        val snapshot = model.snapshot()
-        val saved_color = gfx.getColor
-        try {
+      val gutter = text_area.getGutter
+      val width = GutterOptionPane.getSelectionAreaWidth
+      val border_width = jEdit.getIntegerProperty("view.gutter.borderWidth", 3)
+      val FOLD_MARKER_SIZE = 12
+
+      if (gutter.isSelectionAreaEnabled && !gutter.isExpanded && width >= 12 && line_height >= 12) {
+        Isabelle.swing_buffer_lock(model.buffer) {
+          val snapshot = model.snapshot()
           for (i <- 0 until physical_lines.length) {
             if (physical_lines(i) != -1) {
               val line_range = proper_line_range(start(i), end(i))
-              val cmds = snapshot.node.command_range(snapshot.revert(line_range)).toStream
 
               // gutter icons
-              val states = cmds.map(p => snapshot.state(p._1))
+              val cmds = snapshot.node.command_range(snapshot.revert(line_range))
+              val states = cmds.map(p => snapshot.state(p._1)).toStream
               val opt_icon =
                 if (states.exists(_.results.exists(p => Isar_Document.is_error(p._2))))
                   Some(Document_View.error_icon)
@@ -383,16 +388,14 @@
                 else None
               opt_icon match {
                 case Some(icon) if icon.getIconWidth > 0 && icon.getIconHeight > 0 =>
-                  val FOLD_MARKER_SIZE = 12
-                  val x0 = ((FOLD_MARKER_SIZE - icon.getIconWidth) / 2) max 0
+                  val x0 = (FOLD_MARKER_SIZE + width - border_width - icon.getIconWidth) max 10
                   val y0 = y + i * line_height + (((line_height - icon.getIconHeight) / 2) max 0)
-                  icon.paintIcon(text_area.getPainter, gfx, x0, y0)
+                  icon.paintIcon(gutter, gfx, x0, y0)
                 case _ =>
               }
             }
           }
         }
-        finally { gfx.setColor(saved_color) }
       }
     }
   }