andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fixed update icon linux ubuntu 24

Browse Source
This commit is contained in:
dranik
2026-05-29 22:22:53 +03:00
parent 9857a5d90a
commit 9fa03e5387
3 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/utils/platformTheme.cpp
+4
View File
@@ -7,6 +7,8 @@
# include "platforms/macos/macosutils.h"
#elif defined(Q_OS_WIN)
# include "platforms/windows/windowsutils.h"
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
# include "platforms/linux/linuxutils.h"
#endif
bool platformIsDarkTheme()
@@ -15,6 +17,8 @@ bool platformIsDarkTheme()
return MacOSUtils::isDarkTheme();
#elif defined(Q_OS_WIN)
return WindowsUtils::isDarkTheme();
#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
return LinuxUtils::isDarkTheme();
#else
if (QStyleHints *styleHints = QGuiApplication::styleHints()) {
return styleHints->colorScheme() == Qt::ColorScheme::Dark;
client/ui/utils/systemTrayNotificationHandler.cpp
+53 -16
View File
@@ -27,6 +27,10 @@
# include "platforms/windows/windowsutils.h"
#endif
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
# include "platforms/linux/linuxutils.h"
#endif
#include "version.h"
namespace {
@@ -34,6 +38,10 @@ namespace {
constexpr int kTrayIconSize = 128;
constexpr char kTrayTemplateIconPath[] = ":/images/tray/icon.svg";
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
constexpr int kLinuxTrayIconSizes[] = {16, 22, 24, 32, 48, 64, 128};
#endif
class TrayThemeChangeFilter final : public QObject {
public:
explicit TrayThemeChangeFilter(std::function<void()> onThemeChanged, QObject *parent = nullptr)
@@ -58,10 +66,10 @@ private:
std::function<void()> m_onThemeChanged;
};
QPixmap renderTrayTemplate(const QString &resourcePath, qreal opacity)
QPixmap renderTrayTemplate(const QString &resourcePath, qreal opacity, int size)
{
QSvgRenderer renderer(resourcePath);
QPixmap pixmap(kTrayIconSize, kTrayIconSize);
QPixmap pixmap(size, size);
pixmap.fill(Qt::transparent);
if (!renderer.isValid()) {
@@ -71,13 +79,13 @@ QPixmap renderTrayTemplate(const QString &resourcePath, qreal opacity)
QPainter painter(&pixmap);
painter.setOpacity(opacity);
renderer.render(&painter, QRectF(0, 0, kTrayIconSize, kTrayIconSize));
renderer.render(&painter, QRectF(0, 0, size, size));
return pixmap;
}
QPixmap colorizeTrayTemplate(const QPixmap &mask, const QColor &foreground)
QPixmap colorizeTrayTemplate(const QPixmap &mask, const QColor &foreground, int size)
{
QPixmap result(kTrayIconSize, kTrayIconSize);
QPixmap result(size, size);
result.fill(Qt::transparent);
QPainter painter(&result);
@@ -87,10 +95,10 @@ QPixmap colorizeTrayTemplate(const QPixmap &mask, const QColor &foreground)
return result;
}
void drawStatusIndicator(QPainter &painter, const QColor &color)
void drawStatusIndicator(QPainter &painter, const QColor &color, int size)
{
const qreal dotSize = kTrayIconSize * 0.35;
const qreal dotOrigin = (kTrayIconSize - dotSize) * 0.8;
const qreal dotSize = size * 0.35;
const qreal dotOrigin = (size - dotSize) * 0.8;
painter.setPen(Qt::NoPen);
painter.setBrush(color);
@@ -99,7 +107,7 @@ void drawStatusIndicator(QPainter &painter, const QColor &color)
QByteArray renderTrayTemplatePng(qreal opacity)
{
const QPixmap pixmap = renderTrayTemplate(QString::fromLatin1(kTrayTemplateIconPath), opacity);
const QPixmap pixmap = renderTrayTemplate(QString::fromLatin1(kTrayTemplateIconPath), opacity, kTrayIconSize);
QByteArray bytes;
QBuffer buffer(&bytes);
@@ -108,19 +116,32 @@ QByteArray renderTrayTemplatePng(qreal opacity)
return bytes;
}
QIcon buildTrayIcon(qreal opacity, bool darkTheme, const QColor &indicatorColor)
QPixmap buildTrayPixmap(int size, qreal opacity, bool darkTheme, const QColor &indicatorColor)
{
const QPixmap mask = renderTrayTemplate(QString::fromLatin1(kTrayTemplateIconPath), opacity);
const QPixmap mask = renderTrayTemplate(QString::fromLatin1(kTrayTemplateIconPath), opacity, size);
const QColor foreground = darkTheme ? Qt::white : Qt::black;
QPixmap pixmap = colorizeTrayTemplate(mask, foreground);
QPixmap pixmap = colorizeTrayTemplate(mask, foreground, size);
if (indicatorColor.isValid()) {
QPainter painter(&pixmap);
drawStatusIndicator(painter, indicatorColor);
drawStatusIndicator(painter, indicatorColor, size);
}
return pixmap;
}
QIcon buildTrayIcon(qreal opacity, bool darkTheme, const QColor &indicatorColor)
{
QIcon icon;
icon.addPixmap(pixmap);
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
for (int size : kLinuxTrayIconSizes) {
icon.addPixmap(buildTrayPixmap(size, opacity, darkTheme, indicatorColor));
}
#else
icon.addPixmap(buildTrayPixmap(kTrayIconSize, opacity, darkTheme, indicatorColor));
#endif
return icon;
}
@@ -166,18 +187,26 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
});
}
#if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID)
qApp->installEventFilter(new TrayThemeChangeFilter([this]() {
refreshTheme();
}, this));
#endif
#if defined(Q_OS_WIN)
WindowsUtils::installThemeChangeObserver([this]() {
refreshTheme();
});
#endif
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
LinuxUtils::installThemeChangeObserver([this]() {
refreshTheme();
});
#endif
#endif
refreshTheme();
m_isDarkTheme = platformIsDarkTheme();
setTrayState(Vpn::ConnectionState::Disconnected);
#if !defined(Q_OS_MAC) || defined(MACOS_NE)
@@ -216,7 +245,12 @@ void SystemTrayNotificationHandler::updateWebsiteUrl(const QString &newWebsiteUr
void SystemTrayNotificationHandler::refreshTheme()
{
m_isDarkTheme = platformIsDarkTheme();
const bool isDarkTheme = platformIsDarkTheme();
if (isDarkTheme == m_isDarkTheme) {
return;
}
m_isDarkTheme = isDarkTheme;
#if !defined(Q_OS_MAC) || defined(MACOS_NE)
updateTrayIcon();
@@ -322,6 +356,9 @@ void SystemTrayNotificationHandler::setTrayState(Vpn::ConnectionState state)
}
#endif
}
template<typename> constexpr auto SystemTrayNotificationHandler::qt_create_metaobjectdata()
{
}
void SystemTrayNotificationHandler::notify(NotificationHandler::Message type,
const QString& title,