Skip to content

Add fontconfig assertion and path #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vrcomputing wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add fontconfig assertion and path #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6545b4
add fontconfig asserting and path
vrcomputing Feb 19, 2024
0fcdc7f
use qt version specific font weight boundaries
vrcomputing Feb 19, 2024
3f6006e
simplify assertion
vrcomputing Feb 19, 2024
0f8964f
add support library to iot smoketest
vrcomputing Feb 19, 2024
247dbaa
force assertion
vrcomputing Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ jobs:
QT_DEBUG_PLUGINS: "1"
run: |
echo "starting iotdashboard"
DYLD_LIBRARY_PATH=./qskinny_install/lib:./qskinny_install/plugins/skins ./qskinny_build/examples/bin/iotdashboard.app/Contents/MacOS/iotdashboard -qwindowgeometry 1024x600+75+100 --screenshot ${{ matrix.config.screenshot_filename }} &
DYLD_LIBRARY_PATH=./qskinny_install/lib:./qskinny_install/plugins/skins:./qskinny_build/support ./qskinny_build/examples/bin/iotdashboard.app/Contents/MacOS/iotdashboard -qwindowgeometry 1024x600+75+100 --screenshot ${{ matrix.config.screenshot_filename }} &
sleep 10

# TODO remove 'qskinny_build\skins\material3\Release' when skin install is fixed
Expand All @@ -389,7 +389,7 @@ jobs:
env:
QT_DEBUG_PLUGINS: "1"
run: |
$env:Path += ";./qskinny_install/bin;./qskinny_install/lib;./qskinny_install/plugins/skins;./qskinny_build/skins/material3/Release;./qskinny_build/skins/windows/Release;./qskinny_build/skins/squiek/Release"
$env:Path += ";./qskinny_install/bin;./qskinny_install/lib;./qskinny_install/plugins/skins;./qskinny_build/skins/material3/Release;./qskinny_build/skins/windows/Release;./qskinny_build/skins/squiek/Release;./qskinny_build/support"
echo "starting iotdashboard"
Start-Process qskinny_build\examples\bin\Release\iotdashboard.exe -ArgumentList "-qwindowgeometry 1024x600+0+0 --screenshot ${{ matrix.config.screenshot_filename }}"
Start-Sleep -Seconds 10
Expand Down
10 changes: 9 additions & 1 deletion src/controls/QskSkin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,16 @@ void QskSkin::completeFontTable()
continue;
}

#define QFONT_WEIGHT_MIN 1
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
#define QFONT_WEIGHT_MAX 99
#else
// https://codebrowser.dev/qt6/qtbase/src/gui/text/qfont_p.h.html#34
#define QFONT_WEIGHT_MAX 1000
#endif

int weight = normalFont.weight() + ( j - 2 ) * 100;
weight = qBound( 0, weight, 900 );
weight = qBound( QFONT_WEIGHT_MIN, weight, QFONT_WEIGHT_MAX );

auto font = normalFont;
font.setWeight( static_cast< QFont::Weight >( weight ) );
Expand Down
5 changes: 4 additions & 1 deletion support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ if(HIDE_SYSTEM_FONTS)
@ONLY NEWLINE_STYLE LF)

target_compile_definitions(${target}
PRIVATE FONTCONFIG_FILE=${QSK_FONTCONF_FILE})
PRIVATE
FONTCONFIG_FILE=${QSK_FONTCONF_FILE}
FONTCONFIG_PATH=${QSK_FONTCACHEDIR}
QSK_FONTCONFIG_ASSERT)
endif()

set_target_properties(${target} PROPERTIES FOLDER libs)
43 changes: 35 additions & 8 deletions support/SkinnyNamespace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ static bool pluginPath = initPluginPath();

#if defined( ENSURE_FONTS )

#include <QFontInfo>
#include <iostream>

#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
#include <QFontDatabase>
#include <QElapsedTimer>
Expand Down Expand Up @@ -112,22 +115,46 @@ static bool pluginPath = initPluginPath();
if ( !qobject_cast< QGuiApplication* >( qApp ) )
return; // no fonts needed

#ifdef FONTCONFIG_FILE
#ifdef FONTCONFIG_FILE
{
const char env[] = "FONTCONFIG_FILE";
if ( !qEnvironmentVariableIsSet( env ) )
qputenv( env, STRING( FONTCONFIG_FILE ) );
#endif

preloadFonts();
std::cout << "FONTCONFIG_FILE: " << qgetenv(env).toStdString() <<'\n';
}
#endif

#ifdef FONTCONFIG_PATH
{
const char env[] = "FONTCONFIG_PATH";
if ( !qEnvironmentVariableIsSet( env ) )
qputenv( env, STRING( FONTCONFIG_PATH ) );

/*
The default initialization in QskSkin sets up its font table
with using the application font for the default font role.
*/
QGuiApplication::setFont( QFont( "DejaVuSans", 12 ) );
std::cout << "FONTCONFIG_PATH: " << qgetenv(env).toStdString() <<'\n';
}
#endif

preloadFonts();

/*
The default initialization in QskSkin sets up its font table
with using the application font for the default font role.
*/
QGuiApplication::setFont( QFont( "DejaVuSans", 12 ) );

// #if ( defined( FONTCONFIG_FILE ) || defined( FONTCONFIG_PATH ) ) && defined( QSK_FONTCONFIG_ASSERT )
const QString expected = "Roboto";
const QString actual = QFontInfo( QFont( expected ) ).family();
const QString message = QString( "Expected '%1' font to be available but instead got '%2'" )
.arg( expected )
.arg( actual );

Q_ASSERT_X( actual == expected, __func__, message.toStdString().c_str() );
// #endif
}
#endif

Q_COREAPP_STARTUP_FUNCTION( initFonts )

void Skinny::changeSkin()
Expand Down