Ticket #2149: links_highlights_foreground.patch

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/smart/layout/HotSegmentLayout.java

@@ -2 +2 @@
 
 import java.awt.Color;
 import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.font.LineBreakMeasurer;
 import java.awt.font.TextHitInfo;
 import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
 import java.util.Comparator;
 import java.util.Iterator;
 
@@ -94 +97 @@
                 Graphics2D graphics = (Graphics2D) g2d.create();
                 graphics.translate(x, y);
                 awtLayout.draw(graphics, 0f, 0f);
+                awtLayout.draw(graphics, 0f, 0f);
+
                 boolean caretHandled = false;
                 for (Iterator<HotHighlight> iter = highlights.getIterator(); iter.hasNext();) {
                         HotHighlight highlight = iter.next();
@@ -131 +136 @@
                         // Retrieve highlight region for selection range.
                         Shape highlightShape = awtLayout.getLogicalHighlightShape(
                                         interval.getBegin(), interval.getEnd());
-                    // Fill the highlight region with the highlight color.
-                    ImmColor bgColor = (ImmColor)highlight.getStyle().getValue(CommonAttr.BACKGROUND_COLOR);
+                        Shape highlightOutline = awtLayout.getOutline(new AffineTransform());
+
+                        Area areaOuline = new Area(highlightOutline);
+                        Area areaBounding = new Area(highlightShape);
+
+                        areaOuline.intersect(areaBounding);
+                        areaBounding.subtract(areaOuline);
 
-                    graphics.setColor(bgColor.toAwtColor());
-                    graphics.fill(highlightShape);
+                        // Fill the highlight region with the background highlight color.
+                        ImmColor bgColor = (ImmColor) highlight.getStyle()
+                                        .getValue(CommonAttr.BACKGROUND_COLOR);
+
+                        // Fill the highlight outline with the foreground highlight color.
+                        ImmColor fgColor = (ImmColor) highlight.getStyle()
+                                        .getValue(CommonAttr.FOREGROUND_COLOR);
+
+                        int clearX = (int) highlightShape.getBounds().getX();
+                        int clearY = (int) highlightShape.getBounds().getY();
+                        int clearWidth = (int) highlightShape.getBounds().getWidth();
+                        int clearHeight = (int) highlightShape.getBounds().getHeight();
+
+                        graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                        
+                        graphics.clearRect(clearX, clearY, clearWidth, clearHeight);
+
+                        graphics.setColor(bgColor.toAwtColor());
+                        graphics.fill(areaBounding);
+
+
+                        graphics.setColor(fgColor.toAwtColor());
+                        graphics.fill(areaOuline);
                 }
+                
                 if (withCaret) {
                         HotPos caretPos = end;
                         HotPos textEnd = this.text.getEnd();

modules/org.sophie2.base.scene/src/main/java/org/sophie2/base/scene/helpers/HotTextElementHelper.java

@@ -95 +95 @@
                         
                         Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
                         styleValues.put(CommonAttr.BACKGROUND_COLOR, SELECTION_BACKGROUND_COLOR);
+                        styleValues.put(CommonAttr.FOREGROUND_COLOR, ImmColor.WHITE);
                         HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
                         HotHighlight selectionHighlight = new HotHighlight(new HotInterval(markPos, caretPos), 
                                         style);

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/HeadTextFrameView.java

@@ -60 +60 @@
  * @author kyli
  */
 public class HeadTextFrameView extends TextFrameView {
+        
+        /**
+         * The color of the background of links.
+         */
+        static ImmColor BACKGROUND_LINKS_COLOR = ImmColor.YELLOW;
 
         /**
          * A constructor with {@link ResourceAccess}.
@@ -246 +251 @@
 
                                                                         private HotHighlight createBgHighlight(HotInterval interval, ImmColor color) {
                                                                                 Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
-                                                                                styleValues.put(CommonAttr.BACKGROUND_COLOR, color);
+                                                                                styleValues.put(CommonAttr.FOREGROUND_COLOR, color);
+                                                                                styleValues.put(CommonAttr.BACKGROUND_COLOR, BACKGROUND_LINKS_COLOR);
                                                                                 HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
 
                                                                                 return new HotHighlight(interval, style);