Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:50:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Replace Noto Color Emoji with Twitter Color Emoji"

Browse Source 
This reverts commit 7c98ac9592.
This commit is contained in:
Nova 2025-10-03 15:59:58 +03:30
parent 808c4f31a9
commit f98c77eb1e
8 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -223,11 +223,7 @@ set(PROJECT_SOURCES
) )
if (NOT APPLE AND Qt6_VERSION VERSION_GREATER_EQUAL 6.9.0) if (NOT APPLE AND Qt6_VERSION VERSION_GREATER_EQUAL 6.9.0)
if (WIN32) list(APPEND PROJECT_SOURCES res/EmojiFont.qrc)
list(APPEND PROJECT_SOURCES res/EmojiFontWin.qrc)
else ()
list(APPEND PROJECT_SOURCES res/EmojiFontLin.qrc)
endif ()
endif () endif ()
# Qt exe # Qt exe

5
res/EmojiFont.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/font">
<file alias="notoEmoji">font/NotoColorEmoji.ttf</file>
</qresource>
</RCC>

5
res/EmojiFontLin.qrc
View File

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/font">
<file alias="emojiFont">font/TwemojiMozilla.ttf</file>
</qresource>
</RCC>

5
res/EmojiFontWin.qrc
View File

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/font">
<file alias="emojiFont">font/seguiemj.ttf</file>
</qresource>
</RCC>

BIN
res/font/NotoColorEmoji.ttf Normal file
View File

Binary file not shown.

BIN
res/font/TwemojiMozilla.ttf
View File

Binary file not shown.

BIN
res/font/seguiemj.ttf
View File

Binary file not shown.

4
src/main.cpp
View File

@ -71,14 +71,14 @@ int main(int argc, char* argv[]) {
#if !defined(Q_OS_MACOS) && (QT_VERSION >= QT_VERSION_CHECK(6,9,0)) #if !defined(Q_OS_MACOS) && (QT_VERSION >= QT_VERSION_CHECK(6,9,0))
// Load the emoji fonts // Load the emoji fonts
int fontId = QFontDatabase::addApplicationFont(":/font/emojiFont"); int fontId = QFontDatabase::addApplicationFont(":/font/notoEmoji");
if (fontId >= 0) if (fontId >= 0)
{ {
QStringList fontFamilies = QFontDatabase::applicationFontFamilies(fontId); QStringList fontFamilies = QFontDatabase::applicationFontFamilies(fontId);
QFontDatabase::setApplicationEmojiFontFamilies(fontFamilies); QFontDatabase::setApplicationEmojiFontFamilies(fontFamilies);
} else } else
{ {
qDebug() << "could not load emoji font!"; qDebug() << "could not load noto font!";
} }
#endif #endif