Ticket #2111: highlight.patch

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

@@ -93 +93 @@
 
                 Graphics2D graphics = (Graphics2D) g2d.create();
                 graphics.translate(x, y);
-
+                awtLayout.draw(graphics, 0f, 0f);
                 boolean caretHandled = false;
                 for (Iterator<HotHighlight> iter = highlights.getIterator(); iter.hasNext();) {
                         HotHighlight highlight = iter.next();
                         drawHighlight(graphics, highlight, !caretHandled, isLast);
                         caretHandled = true;
                 }
-                awtLayout.draw(graphics, 0f, 0f);
-
+                
                 graphics.dispose();
         }
 
@@ -126 +125 @@
                 HotPos end = intersection.getEnd();
                 HotIndexInterval interval = TextUtils.posToIndexInterval(this.text, 
                                 begin, end);
+                
+                
+                if (interval.getBegin() != interval.getEnd()) {
+                        // 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);
+
+                    graphics.setColor(bgColor.toAwtColor());
+                    graphics.fill(highlightShape);
+                }
                 if (withCaret) {
                         HotPos caretPos = end;
                         HotPos textEnd = this.text.getEnd();
@@ -142 +153 @@
                                 graphics.draw(carets[0]);
                         }
                 }
-                
-                if (interval.getBegin() != interval.getEnd()) {
-                        // 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);
-
-                    graphics.setColor(bgColor.toAwtColor());
-                    graphics.fill(highlightShape);
-                }
         }
 
         private TextLayout awtLayoutCache = null;

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

@@ -88 +88 @@
                         assert caretPos != null;
                         
                         Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
-                        styleValues.put(CommonAttr.BACKGROUND_COLOR, ImmColor.BLUE);
+                        styleValues.put(CommonAttr.BACKGROUND_COLOR, new ImmColor(0f,0f,1f,0.2f));
                         HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
                         HotHighlight h = new HotHighlight(new HotInterval(markPos, caretPos), 
                                         style);

modules/org.sophie2.base.model.text/src/main/java/org/sophie2/base/model/text/mvc/swing/SimpleSwingTextView.java

@@ -111 +111 @@
                         g2d.draw(textFlow().get().getAreas().get(0).toShape());
                         
                         Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
-                        styleValues.put(CommonAttr.BACKGROUND_COLOR, ImmColor.BLUE);
+                        styleValues.put(CommonAttr.BACKGROUND_COLOR, new ImmColor(0f, 0f, 1f, 0.2f));
                         HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
                         
                         HotPos caretPos = textFlow().get().caretPos().get();

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

@@ -170 +170 @@
                         Matcher matcher = pattern.matcher(text);
                         if (matcher.find()) {
                                 Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
-                                styleValues.put(CommonAttr.BACKGROUND_COLOR, ImmColor.YELLOW);
+                                styleValues.put(CommonAttr.BACKGROUND_COLOR, new ImmColor(1.0f, 1.0f, 0f, 0.2f));
                                 HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
                                 HotInterval interval = new HotInterval(sText.advance(currentPos, scale
                                                 * matcher.start()), sText.advance(currentPos, scale * matcher.end()));

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/styling/TextColorField.java

@@ -46 +46 @@
                 /**
                  * Handles text color changing.
                  */
-                ON_COLOR_SUBMI {
+                ON_COLOR_SUBMIT {
 
                         public void defineFilter(EventFilterBuilder filter) {
                                 filter.setSourceClass(TextColorField.class);