OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-02 09:00:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use point size when defining font size

Browse Source 
Avoid pixel size for easier config across multiple environments
Set default font size for plots to 10 points
Use Small instead of XSmall for default font in plot
Remove pt postfix to indicate point size
This commit is contained in:
Magne Sjaastad committed 2025-03-10 16:56:16 +01:00
1 parent 559599c72d
commit 5f7823b8d3
34 files changed
+87 -116
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp
+2 -18
View File
@@ -89,25 +89,9 @@ int FontTools::absolutePointSize( FontSize normalPointSize, RelativeSize relativ
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int FontTools::pointSizeToPixelSize( int pointSize )
int FontTools::pointSizeFromEnum( FontSize pointSize )
{
return pointSize;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int FontTools::pointSizeToPixelSize( FontSize pointSize )
{
return pointSizeToPixelSize( (int)pointSize );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int FontTools::pixelSizeToPointSize( int pixelSize )
{
return pixelSize;
return (int)pointSize;
}
QList<PdmOptionItemInfo> FontTools::relativeSizeValueOptions( FontSize normalPointSize )
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.h
+1 -3
View File
@@ -83,9 +83,7 @@ public:
typedef caf::AppEnum<RelativeSize> RelativeSizeEnum;
static int absolutePointSize( FontSize normalPointSize, RelativeSize relativeSize = RelativeSize::Medium );
static int pointSizeToPixelSize( FontSize pointSize );
static int pointSizeToPixelSize( int pointSize );
static int pixelSizeToPointSize( int pixelSize );
static int pointSizeFromEnum( FontSize pointSize );
static QList<caf::PdmOptionItemInfo> relativeSizeValueOptions( FontSize normalPointSize );
};
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
+1 -8
View File
@@ -163,14 +163,7 @@ void PdmUiTreeViewItemDelegate::paint( QPainter* painter, const QStyleOptionView
const int outsideLeftRightMargins = 4;
QFont font = QApplication::font();
if ( font.pixelSize() > 0 )
{
font.setPixelSize( std::max( 1, font.pixelSize() - 1 ) );
}
else
{
font.setPointSize( std::max( 1, font.pointSize() - 1 ) );
}
font.setPointSize( std::max( 1, font.pointSize() - 1 ) );
painter->setFont( font );
QString text = tag->text;