Fossil SCM

Pikchr text formatting bug fix: Preserve "bold" and "italic" on multi-line text objects.

drh 2020-09-10 16:52 trunk
Commit bf01b42928e913fc1d0d43e569b0214d35beeaaa2de52a969a8ca1ce4f139134
1 file changed +1 -1
+1 -1
--- src/pikchr.c
+++ src/pikchr.c
@@ -4231,11 +4231,11 @@
42314231
if( (allSlots & TP_BELOW)==0 ) aFree[iSlot++] = TP_BELOW;
42324232
if( n>=4 && (allSlots & TP_BELOW2)==0 ) aFree[iSlot++] = TP_BELOW2;
42334233
/* Set the VMASK for all unassigned texts */
42344234
for(i=iSlot=0; i<n; i++){
42354235
if( (aTxt[i].eCode & TP_VMASK)==0 ){
4236
- aTxt[i].eCode = aFree[iSlot++];
4236
+ aTxt[i].eCode |= aFree[iSlot++];
42374237
}
42384238
}
42394239
}
42404240
}
42414241
42424242
--- src/pikchr.c
+++ src/pikchr.c
@@ -4231,11 +4231,11 @@
4231 if( (allSlots & TP_BELOW)==0 ) aFree[iSlot++] = TP_BELOW;
4232 if( n>=4 && (allSlots & TP_BELOW2)==0 ) aFree[iSlot++] = TP_BELOW2;
4233 /* Set the VMASK for all unassigned texts */
4234 for(i=iSlot=0; i<n; i++){
4235 if( (aTxt[i].eCode & TP_VMASK)==0 ){
4236 aTxt[i].eCode = aFree[iSlot++];
4237 }
4238 }
4239 }
4240 }
4241
4242
--- src/pikchr.c
+++ src/pikchr.c
@@ -4231,11 +4231,11 @@
4231 if( (allSlots & TP_BELOW)==0 ) aFree[iSlot++] = TP_BELOW;
4232 if( n>=4 && (allSlots & TP_BELOW2)==0 ) aFree[iSlot++] = TP_BELOW2;
4233 /* Set the VMASK for all unassigned texts */
4234 for(i=iSlot=0; i<n; i++){
4235 if( (aTxt[i].eCode & TP_VMASK)==0 ){
4236 aTxt[i].eCode |= aFree[iSlot++];
4237 }
4238 }
4239 }
4240 }
4241
4242

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button