daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert font image straight to QIcons

Browse Source 
Fixes a compile error with recent Qt6 versions
This commit is contained in:
G.K.MacGregor
2024-06-17 22:08:31 +01:00
parent a0dd98144a
commit 7cd632b4e2
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
x26model.cpp
View File

@@ -376,27 +376,25 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
break;
case 0x21: // G1 mosaic character
if (triplet.data() & 0x20)
// Returning the bitmap as-is doesn't seem to work here
// but putting it inside a QIcon... does?
return QIcon(m_fontBitmap.charBitmap(triplet.data(), 24));
return m_fontBitmap.charIcon(triplet.data(), 24);
else if (triplet.data() >= 0x20)
// Blast-through
return QIcon(m_fontBitmap.charBitmap(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())));
return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
break;
case 0x22: // G3 mosaic character at level 1.5
case 0x2b: // G3 mosaic character at level >=2.5
if (triplet.data() >= 0x20)
return QIcon(m_fontBitmap.charBitmap(triplet.data(), 26));
return m_fontBitmap.charIcon(triplet.data(), 26);
break;
case 0x2f: // G2 character
if (triplet.data() >= 0x20)
return QIcon(m_fontBitmap.charBitmap(triplet.data(), m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())));
return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
break;
default:
if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
// G0 character or G0 diacritical mark
if (triplet.data() >= 0x20)
return QIcon(m_fontBitmap.charBitmap(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())));
return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
}
if (role == Qt::EditRole && index.column() == 2)