ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Account for font bearing in centering of text number in Qt branch cards.

This commit is contained in:
mjbudd77 2022-01-09 14:42:42 -05:00
parent 1e5a1eddd0
commit 80a7afd7f5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/drivers/Qt/TasEditor/branches.cpp
View File

@ -111,7 +111,7 @@ void BRANCHES::setFont( QFont &newFont )
void BRANCHES::calcFontData(void) void BRANCHES::calcFontData(void)
{ {
int w,h,ch='0'; int w,h,ch='0',bs;
QWidget::setFont(font); QWidget::setFont(font);
QFontMetrics metrics(font); QFontMetrics metrics(font);
#if QT_VERSION > QT_VERSION_CHECK(5, 11, 0) #if QT_VERSION > QT_VERSION_CHECK(5, 11, 0)
@ -119,15 +119,16 @@ void BRANCHES::calcFontData(void)
#else #else
pxCharWidth = metrics.width(QLatin1Char(ch)); pxCharWidth = metrics.width(QLatin1Char(ch));
#endif #endif
//printf(" Width: %i\n", metrics.width(ch) ); printf(" Width: %i\n", metrics.width(ch) );
//printf(" Advance: %i\n", metrics.horizontalAdvance(ch) ); printf(" Advance: %i\n", metrics.horizontalAdvance(ch) );
//printf(" Left Bearing: %i\n", metrics.leftBearing(ch) ); printf(" Left Bearing: %i\n", metrics.leftBearing(ch) );
//printf("Right Bearing: %i\n", metrics.rightBearing(ch) ); printf("Right Bearing: %i\n", metrics.rightBearing(ch) );
//printf(" Ascent: %i\n", metrics.ascent() ); printf(" Ascent: %i\n", metrics.ascent() );
//printf(" Descent: %i\n", metrics.descent() ); printf(" Descent: %i\n", metrics.descent() );
//printf(" Height: %i\n", metrics.height() ); printf(" Height: %i\n", metrics.height() );
//printf(" Line Spacing: %i\n", metrics.lineSpacing() ); printf(" Cap Height: %i\n", metrics.capHeight() );
//printf(" Line Leading: %i\n", metrics.leading() ); printf(" Line Spacing: %i\n", metrics.lineSpacing() );
printf(" Line Leading: %i\n", metrics.leading() );
//for (int i=0; i<TOTAL_BOOKMARKS; i++) //for (int i=0; i<TOTAL_BOOKMARKS; i++)
//{ //{
@ -149,6 +150,8 @@ void BRANCHES::calcFontData(void)
// printf("Char:'%c' x:%i y:%i w:%i h:%i\n", txt[0], boundingRect.x(), boundingRect.y(), boundingRect.width(), boundingRect.height() ); // printf("Char:'%c' x:%i y:%i w:%i h:%i\n", txt[0], boundingRect.x(), boundingRect.y(), boundingRect.width(), boundingRect.height() );
//} //}
bs = (metrics.leftBearing(ch) + metrics.rightBearing(ch)) / 2;
pxCharHeight = metrics.capHeight(); pxCharHeight = metrics.capHeight();
//pxCharHeight = metrics.ascent(); //pxCharHeight = metrics.ascent();
@ -159,8 +162,10 @@ void BRANCHES::calcFontData(void)
pxSelWidth = (pxBoxWidth * 7) / 8; pxSelWidth = (pxBoxWidth * 7) / 8;
pxSelHeight = (pxBoxHeight * 7) / 8; pxSelHeight = (pxBoxHeight * 7) / 8;
pxTextOffsetX = -(pxBoxWidth/2 ) + (pxBoxWidth - pxCharWidth)/2; pxTextOffsetX = -(pxBoxWidth/2 );
pxTextOffsetY = (pxBoxHeight/2) - (pxBoxHeight - pxCharHeight)/2; pxTextOffsetY = (pxBoxHeight/2);
pxTextOffsetX = -(pxBoxWidth/2 ) + (pxBoxWidth - pxCharWidth)/2 + bs;
pxTextOffsetY = (pxBoxHeight/2) - (pxBoxHeight - pxCharHeight)/2 + (pxBoxHeight - pxCharHeight + 1) % 2;
pxMinGridWidth = (pxBoxWidth + 2); pxMinGridWidth = (pxBoxWidth + 2);
pxMaxGridWidth = (pxBoxWidth * 2); pxMaxGridWidth = (pxBoxWidth * 2);