Chameleon Commit Details - 1719 - Chameleon open source boot loader project.

Date:

2011-12-11 17:14:49 (12 years 4 months ago)

Author:

JrCs

Commit:

1719

Parents:

1718

Message:

Fix the vertical centering of text

Changes:

M	/trunk/i386/boot2/gui.c

File differences

-1365
1366 1366
1367 1367
1368
1368 1369
1369 1370
1370 1371
1371 1372
1373
1372 1374
1375
1376
1373 1377
1374 1378
1375 1379
... ...
1383 1387
1384 1388
1385 1389
1386 
1390
1387 1391
1388 
1389 
1390 
1391 1392
1392 1393
1393 1394
+␉int i = 0;␊
␉int width = 0;␊
␉int max_width = 0;␊
␉int height = font->height;␊
␊
␉// calculate the width in pixels␊
␉for (i=0; i < strlen(text); i++) {␊
␉␉if (text[i] == '\n')␊
␉␉{␊
␉␉␉width = 0;␊
␉␉␉height += font->height;␊
␉␉}␊
␉␉else if (text[i] == '\t')␊
␉␉␉width += TAB_PIXELS_WIDTH;␊
␉␉else␊

␉}␊
␊
␉p.x = ( p.x - ( max_width / 2 ) );␊
␉p.y = ( p.y - ( font->height / 2 ) ); ␊
␉p.y = ( p.y - ( height / 2 ) );␊
␉␊
␉if ( p.x == -6 )␊
␉␉p.x = 0;␊
␉␊
␉drawStr(text, font, blendInto, p);␊
}␊
␊
 ...
 ␉int i = 0;␊
 ␉int width = 0;␊
 ␉int max_width = 0;␊
+␉int height = font->height;␊
 ␊
 ␉// calculate the width in pixels␊
 ␉for (i=0; i < strlen(text); i++) {␊
 ␉␉if (text[i] == '\n')␊
+␉␉{␊
 ␉␉␉width = 0;␊
+␉␉␉height += font->height;␊
+␉␉}␊
 ␉␉else if (text[i] == '\t')␊
 ␉␉␉width += TAB_PIXELS_WIDTH;␊
 ␉␉else␊
 ␉}␊
 ␊
 ␉p.x = ( p.x - ( max_width / 2 ) );␊
-␉p.y = ( p.y - ( font->height / 2 ) ); ␊
+␉p.y = ( p.y - ( height / 2 ) );␊
 ␉␊
-␉if ( p.x == -6 )␊
-␉␉p.x = 0;␊
-␉␊
 ␉drawStr(text, font, blendInto, p);␊
 }␊
 ␊

Download the corresponding diff file