Commits:
-
1833b1d1
by Alexei Podtelezhnikov at 2023-02-11T20:06:16-05:00
* src/ftmulti.c (Render_All, Render_Text, main): Layout tweaks.
1 changed file:
Changes:
src/ftmulti.c
| ... |
... |
@@ -391,9 +391,8 @@ |
|
391
|
391
|
|
|
392
|
392
|
|
|
393
|
393
|
start_x = 20 * 8;
|
|
394
|
|
- start_y = pt_size + HEADER_HEIGHT * 3;
|
|
395
|
|
-
|
|
396
|
|
- step_y = size->metrics.y_ppem + 10;
|
|
|
394
|
+ start_y = size->metrics.y_ppem * 4 / 5 + HEADER_HEIGHT * 3;
|
|
|
395
|
+ step_y = size->metrics.y_ppem + 10;
|
|
397
|
396
|
|
|
398
|
397
|
x = start_x;
|
|
399
|
398
|
y = start_y;
|
| ... |
... |
@@ -427,7 +426,7 @@ |
|
427
|
426
|
x = start_x;
|
|
428
|
427
|
y += step_y;
|
|
429
|
428
|
|
|
430
|
|
- if ( y >= bit->rows )
|
|
|
429
|
+ if ( y >= bit->rows - size->metrics.y_ppem / 5 )
|
|
431
|
430
|
return FT_Err_Ok;
|
|
432
|
431
|
}
|
|
433
|
432
|
|
| ... |
... |
@@ -455,9 +454,8 @@ |
|
455
|
454
|
|
|
456
|
455
|
|
|
457
|
456
|
start_x = 20 * 8;
|
|
458
|
|
- start_y = pt_size + HEADER_HEIGHT * 3;
|
|
459
|
|
-
|
|
460
|
|
- step_y = size->metrics.y_ppem + 10;
|
|
|
457
|
+ start_y = size->metrics.y_ppem * 4 / 5 + HEADER_HEIGHT * 3;
|
|
|
458
|
+ step_y = size->metrics.y_ppem + 10;
|
|
461
|
459
|
|
|
462
|
460
|
x = start_x;
|
|
463
|
461
|
y = start_y;
|
| ... |
... |
@@ -498,7 +496,7 @@ |
|
498
|
496
|
x = start_x;
|
|
499
|
497
|
y += step_y;
|
|
500
|
498
|
|
|
501
|
|
- if ( y >= bit->rows )
|
|
|
499
|
+ if ( y >= bit->rows - size->metrics.y_ppem / 5 )
|
|
502
|
500
|
return FT_Err_Ok;
|
|
503
|
501
|
}
|
|
504
|
502
|
}
|
| ... |
... |
@@ -1175,8 +1173,8 @@ |
|
1175
|
1173
|
grWriteCellString( bit, 0, 2 * HEADER_HEIGHT, Header, fore_color );
|
|
1176
|
1174
|
|
|
1177
|
1175
|
strbuf_reset( header );
|
|
1178
|
|
- strbuf_add( header, "axes:" );
|
|
1179
|
|
- grWriteCellString( bit, 0, 3 * HEADER_HEIGHT, Header, fore_color );
|
|
|
1176
|
+ strbuf_format( header, "axes (\361 %.1f%%):", increment / 10.0 );
|
|
|
1177
|
+ grWriteCellString( bit, 0, 4 * HEADER_HEIGHT, Header, fore_color );
|
|
1180
|
1178
|
for ( n = 0; n < num_shown_axes; n++ )
|
|
1181
|
1179
|
{
|
|
1182
|
1180
|
int axis = shown_axes[n];
|
| ... |
... |
@@ -1188,7 +1186,7 @@ |
|
1188
|
1186
|
multimaster->axis[axis].name,
|
|
1189
|
1187
|
hidden[axis] ? "*" : "",
|
|
1190
|
1188
|
design_pos[axis] / 65536.0 );
|
|
1191
|
|
- grWriteCellString( bit, 0, (int)( n + 4 ) * HEADER_HEIGHT,
|
|
|
1189
|
+ grWriteCellString( bit, 0, (int)( n + 5 ) * HEADER_HEIGHT,
|
|
1192
|
1190
|
Header, fore_color );
|
|
1193
|
1191
|
}
|
|
1194
|
1192
|
|
| ... |
... |
@@ -1221,11 +1219,10 @@ |
|
1221
|
1219
|
strbuf_reset( header );
|
|
1222
|
1220
|
strbuf_format(
|
|
1223
|
1221
|
header,
|
|
1224
|
|
- "size: %dpt, first glyph: %d, format: %s, axis incr.: %.1f%%",
|
|
|
1222
|
+ "size: %dpt, first glyph: %d, format: %s",
|
|
1225
|
1223
|
ptsize,
|
|
1226
|
1224
|
Num,
|
|
1227
|
|
- format_str,
|
|
1228
|
|
- increment / 10.0 );
|
|
|
1225
|
+ format_str );
|
|
1229
|
1226
|
}
|
|
1230
|
1227
|
}
|
|
1231
|
1228
|
else
|
|