StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(widget): replace byteCount() with sizeInBytes in Qt 5.13

Browse Source
This commit is contained in:
jenli669 2019-07-17 00:14:20 +02:00
parent 34e1e25b7f
commit dbf56581bb
No known key found for this signature in database
GPG Key ID: 8267F9F7C2BF7E5E
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widget/systemtrayicon.cpp
View File

@ -115,9 +115,13 @@ GdkPixbuf* SystemTrayIcon::convertQIconToPixbuf(const QIcon& icon)
QImage image = icon.pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
guchar* image_bytes = new guchar[image.sizeInBytes()];
memcpy(image_bytes, image.bits(), image.sizeInBytes());
#else
guchar* image_bytes = new guchar[image.byteCount()];
memcpy(image_bytes, image.bits(), image.byteCount());
#endif
return gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(), 8,
image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, nullptr);
@ -214,8 +218,8 @@ void SystemTrayIcon::setContextMenu(QMenu* menu)
else if (a->icon().isNull())
item = gtk_menu_item_new_with_label(aText.c_str());
else {
const std::string iconPath = extractIconToFile(a->icon(),
"iconmenu" + a->icon().name()).toStdString();
const std::string iconPath =
extractIconToFile(a->icon(), "iconmenu" + a->icon().name()).toStdString();
GtkWidget* image = gtk_image_new_from_file(iconPath.c_str());
item = gtk_image_menu_item_new_with_label(aText.c_str());
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);