Commit 4465df05 authored by Frédéric Larue's avatar Frédéric Larue

Some font redefinition problems fixed.

parent f14b3515
......@@ -178,17 +178,17 @@ void MetricGrid::displayGrid( GLViewer *viewer,
if( isAxisEnabled(X) && QVector3D::dotProduct( QVector3D(spacing,0,0)-camCenter, camFront ) < 0.0f )
{
glColor4ub( 255, 130, 130, alpha*alphaX );
viewer->renderText( spacing, spacing/40.0, spacing/40.0, "X = "+spacingStr );
viewer->renderText( spacing, spacing/40.0, spacing/40.0, "X = "+spacingStr, QApplication::font() );
}
if( isAxisEnabled(Y) && QVector3D::dotProduct( QVector3D(0,spacing,0)-camCenter, camFront ) < 0.0f )
{
glColor4ub( 200, 255, 200, alpha*alphaY );
viewer->renderText( spacing/40.0, spacing, spacing/40.0, "Y = "+spacingStr );
viewer->renderText( spacing/40.0, spacing, spacing/40.0, "Y = "+spacingStr, QApplication::font() );
}
if( isAxisEnabled(Z) && QVector3D::dotProduct( QVector3D(0,0,spacing)-camCenter, camFront ) < 0.0f )
{
glColor4ub( 130, 130, 255, alpha*alphaZ );
viewer->renderText( spacing/40.0, spacing/40.0, spacing, "Z = "+spacingStr );
viewer->renderText( spacing/40.0, spacing/40.0, spacing, "Z = "+spacingStr, QApplication::font() );
}
}
......
......@@ -135,7 +135,7 @@ void AlgorithmSelector::finalizeTools()
m_CategoryButtonGroup->addButton( categoryButton, categoryId );
QLabel *categoryLabel = new QLabel( ToolCategory::categoryName(categoryId) );
QFont f = categoryLabel->font();
QFont f = QApplication::font();
f.setPointSize( 7 );
categoryLabel->setFont( f );
categoryLabel->setAlignment( Qt::AlignHCenter );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment