Changeset 1416 for trunk/src/org/expeditee/items/Text.java

Timestamp:

07/24/19 13:23:34 (5 years ago)

Author:

bln4

Message:

Fixed font size of surrogate effecting primary.
Added comment to further document how EncryptionDetail.Type.InheritanceCheckOnSave works.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (2 diffs)

trunk/src/org/expeditee/items/Text.java

@@ -2269 +2269 @@
         @Override
         public float getSize() {
-                return getPaintFont().getSize();
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.FONT_STR)) {
+                        return ((Text) this.getPrimary()).getSize();
+                } else {
+                        return getPaintFont().getSize();
+                }
+                
+                //return getPaintFont().getSize();
         }
 
@@ -2298 +2304 @@
                 rebuild(true);
                 invalidateAll();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.FONT_STR, false);
+                        Item primary = getPrimary();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.FONT_STR)) {
+                                EncryptionDetail inheritanceCheckOnSave = new EncryptionDetail(EncryptionDetail.Type.InheritanceCheckOnSave);
+                                primary.primaryPropertyEncryption.put(DefaultFrameWriter.FONT_STR, inheritanceCheckOnSave);
+                        }
+                }
         }