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

Merge pull request #3390

Browse Source 
Colomban Wendling (2):
      refactor(systemtrayicon): unify QIcon to GdkPixbuf conversion
      fix(systemtrayicon): don't set an invalid and useless icon on GTK
This commit is contained in:
Zetok Zalbavar 2016-06-16 21:00:00 +01:00
commit e3278853d5
No known key found for this signature in database
GPG Key ID: C953D3880212068A
2 changed files with 28 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/widget/systemtrayicon.cpp
View File

@ -66,10 +66,7 @@ SystemTrayIcon::SystemTrayIcon()
backendType = SystrayBackendType::GTK;
gtk_init(nullptr, nullptr);
// No ':' needed in resource path!
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_resource("/img/icon.png", NULL);
gtkIcon = gtk_status_icon_new_from_pixbuf(pixbuf);
g_object_unref(pixbuf);
gtkIcon = gtk_status_icon_new();
gtkMenu = gtk_menu_new();
@ -116,6 +113,26 @@ QString SystemTrayIcon::extractIconToFile(QIcon icon, QString name)
return iconPath;
}
#if defined(ENABLE_SYSTRAY_GTK_BACKEND) || defined(ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND)
GdkPixbuf* SystemTrayIcon::convertQIconToPixbuf(const QIcon &icon)
{
void (*callbackFreeImage)(guchar*, gpointer) =
[](guchar* image_bytes, gpointer)
{
delete[] image_bytes;
};
QImage image = icon.pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
guchar* image_bytes = new guchar[image.byteCount()];
memcpy(image_bytes, image.bits(), image.byteCount());
return gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(),
8, image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, NULL);
}
#endif
void SystemTrayIcon::setContextMenu(QMenu* menu)
{
if (false);
@ -145,21 +162,7 @@ void SystemTrayIcon::setContextMenu(QMenu* menu)
item = gtk_menu_item_new_with_label(aText.toStdString().c_str());
else
{
void (*callbackFreeImage)(guchar*, gpointer) =
[](guchar*, gpointer image_bytes)
{
free(reinterpret_cast<guchar*>(image_bytes));
};
QImage image = a->icon().pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
guchar* image_bytes = (guchar*)malloc(image.byteCount());
memcpy(image_bytes, image.bits(), image.byteCount());
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(),
8, image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, image_bytes);
GdkPixbuf* pixbuf = convertQIconToPixbuf(a->icon());
item = gtk_image_menu_item_new_with_label(aText.toStdString().c_str());
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_pixbuf(pixbuf));
gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item),TRUE);
@ -195,21 +198,7 @@ void SystemTrayIcon::setContextMenu(QMenu* menu)
item = gtk_menu_item_new_with_label(aText.toStdString().c_str());
else
{
void (*callbackFreeImage)(guchar*, gpointer) =
[](guchar*, gpointer image_bytes)
{
free(reinterpret_cast<guchar*>(image_bytes));
};
QImage image = a->icon().pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
guchar* image_bytes = (guchar*)malloc(image.byteCount());
memcpy(image_bytes, image.bits(), image.byteCount());
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(),
8, image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, image_bytes);
GdkPixbuf* pixbuf = convertQIconToPixbuf(a->icon());
item = gtk_image_menu_item_new_with_label(aText.toStdString().c_str());
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_pixbuf(pixbuf));
gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item),TRUE);
@ -333,21 +322,7 @@ void SystemTrayIcon::setIcon(QIcon &icon)
#ifdef ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND
else if (backendType == SystrayBackendType::StatusNotifier)
{
void (*callbackFreeImage)(guchar*, gpointer) =
[](guchar*, gpointer image_bytes)
{
free(reinterpret_cast<guchar*>(image_bytes));
};
QImage image = icon.pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
guchar* image_bytes = (guchar*)malloc(image.byteCount());
memcpy(image_bytes, image.bits(), image.byteCount());
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(),
8, image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, image_bytes);
GdkPixbuf* pixbuf = convertQIconToPixbuf(icon);
status_notifier_set_from_pixbuf(statusNotifier, STATUS_NOTIFIER_ICON, pixbuf);
g_object_unref(pixbuf);
}
@ -355,21 +330,7 @@ void SystemTrayIcon::setIcon(QIcon &icon)
#ifdef ENABLE_SYSTRAY_GTK_BACKEND
else if (backendType == SystrayBackendType::GTK)
{
void (*callbackFreeImage)(guchar*, gpointer) =
[](guchar*, gpointer image_bytes)
{
free(reinterpret_cast<guchar*>(image_bytes));
};
QImage image = icon.pixmap(64, 64).toImage();
if (image.format() != QImage::Format_RGBA8888_Premultiplied)
image = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
guchar* image_bytes = (guchar*)malloc(image.byteCount());
memcpy(image_bytes, image.bits(), image.byteCount());
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image_bytes, GDK_COLORSPACE_RGB, image.hasAlphaChannel(),
8, image.width(), image.height(), image.bytesPerLine(),
callbackFreeImage, image_bytes);
GdkPixbuf* pixbuf = convertQIconToPixbuf(icon);
gtk_status_icon_set_from_pixbuf(gtkIcon, pixbuf);
g_object_unref(pixbuf);
}

3
src/widget/systemtrayicon.h
View File

@ -44,6 +44,9 @@ signals:
private:
QString extractIconToFile(QIcon icon, QString name="icon");
#if defined(ENABLE_SYSTRAY_GTK_BACKEND) || defined(ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND)
static GdkPixbuf* convertQIconToPixbuf(const QIcon &icon);
#endif
private:
SystrayBackendType backendType;