flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Convert CRgbColor to QPixmap directly

Browse Source 
Converting via CIcon was disabled in order to break cyclic a dependency,
but in these cases a direct conversion had always been possible anyway.
This commit is contained in:
Mat Sutcliffe
2021-08-31 19:03:55 +01:00
parent 6b8eaf1ca2
commit a418add1f3
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/colorselector.cpp
View File

@@ -72,7 +72,7 @@ namespace BlackGui
else
{
ui->le_Color->setText(color.hex());
ui->lbl_ColorIcon->setPixmap(CIcon(color.toIcon()));
ui->lbl_ColorIcon->setPixmap(color.toPixmap());
m_lastColor = color;
}
emit colorChanged(color);
@@ -176,7 +176,7 @@ namespace BlackGui
mimeData->setColorData(QVariant::fromValue(c.toQColor()));
drag->setMimeData(mimeData);
drag->setPixmap(CIcon(c.toIcon()));
drag->setPixmap(c.toPixmap());
Qt::DropAction dropAction = drag->exec(Qt::CopyAction);
Q_UNUSED(dropAction);

2
src/blackgui/models/columnformatters.cpp
View File

@@ -417,7 +417,7 @@ namespace BlackGui
{
const CRgbColor rgbColor(dataCVariant.to<CRgbColor>());
if (!rgbColor.isValid()) { return emptyPixmapVariant(); }
return CVariant::fromValue(CIcon(rgbColor.toIcon()).toPixmap());
return CVariant::fromValue(rgbColor.toPixmap());
}
CVariant CColorFormatter::tooltipRole(const CVariant &dataCVariant) const