procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Multiple sizes for linux tray icon

This commit is contained in:
Ilya Fedin 2020-02-21 19:35:22 +04:00 committed by John Preston
parent 530b212f55
commit 9979c220ce
2 changed files with 131 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -38,11 +38,11 @@ constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs;
constexpr auto kSNIWatcherService = "org.kde.StatusNotifierWatcher"_cs; constexpr auto kSNIWatcherService = "org.kde.StatusNotifierWatcher"_cs;
constexpr auto kTrayIconFilename = "tdesktop-trayicon-XXXXXX.png"_cs; constexpr auto kTrayIconFilename = "tdesktop-trayicon-XXXXXX.png"_cs;
int32 _trayIconSize = 22; bool TrayIconMuted = true;
bool _trayIconMuted = true; int32 TrayIconCount = 0;
int32 _trayIconCount = 0; base::flat_map<int, QImage> TrayIconImageBack;
QImage _trayIconImageBack, _trayIconImage; QIcon TrayIcon;
QString _trayIconThemeName, _trayIconName; QString TrayIconThemeName, TrayIconName;
QString GetPanelIconName() { QString GetPanelIconName() {
const auto counter = Core::App().unreadBadge(); const auto counter = Core::App().unreadBadge();
@ -73,92 +73,133 @@ QString GetTrayIconName() {
return QString(); return QString();
} }
QImage TrayIconImageGen() { QIcon TrayIconGen() {
const auto iconThemeName = QIcon::themeName();
const auto iconName = GetTrayIconName();
if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
&& !iconName.isEmpty()) {
if (TrayIcon.isNull()
|| iconThemeName != TrayIconThemeName
|| iconName != TrayIconName) {
TrayIcon = QIcon::fromTheme(iconName);
TrayIconThemeName = iconThemeName;
TrayIconName = iconName;
}
return TrayIcon;
}
const auto counter = Core::App().unreadBadge(); const auto counter = Core::App().unreadBadge();
const auto muted = Core::App().unreadBadgeMuted(); const auto muted = Core::App().unreadBadgeMuted();
const auto counterSlice = (counter >= 1000) const auto counterSlice = (counter >= 1000)
? (1000 + (counter % 100)) ? (1000 + (counter % 100))
: counter; : counter;
const auto iconThemeName = QIcon::themeName(); if (TrayIcon.isNull()
const auto iconName = GetTrayIconName(); || iconThemeName != TrayIconThemeName
const auto desiredSize = QSize(_trayIconSize, _trayIconSize); || iconName != TrayIconName
|| muted != TrayIconMuted
|| counterSlice != TrayIconCount) {
QIcon result;
QIcon systemIcon;
if (_trayIconImage.isNull() const auto iconSizes = {
|| _trayIconImage.size() != desiredSize 16,
|| iconThemeName != _trayIconThemeName 22,
|| iconName != _trayIconName 24,
|| muted != _trayIconMuted 32,
|| counterSlice != _trayIconCount) { 48,
if (_trayIconImageBack.isNull() 64
|| _trayIconImageBack.size() != desiredSize };
|| iconThemeName != _trayIconThemeName
|| iconName != _trayIconName) {
if (!iconName.isEmpty()) {
const auto systemIcon = QIcon::fromTheme(iconName);
if (systemIcon.actualSize(desiredSize) == desiredSize) { for (const auto iconSize : iconSizes) {
_trayIconImageBack = systemIcon auto &currentImageBack = TrayIconImageBack[iconSize];
.pixmap(desiredSize) const auto desiredSize = QSize(iconSize, iconSize);
.toImage();
if (currentImageBack.isNull()
|| iconThemeName != TrayIconThemeName
|| iconName != TrayIconName) {
if (!iconName.isEmpty()) {
if(systemIcon.isNull()) {
systemIcon = QIcon::fromTheme(iconName);
}
if (systemIcon.actualSize(desiredSize) == desiredSize) {
currentImageBack = systemIcon
.pixmap(desiredSize)
.toImage();
} else {
const auto availableSizes = systemIcon
.availableSizes();
const auto biggestSize = ranges::max_element(
availableSizes,
std::less<>(),
&QSize::width);
currentImageBack = systemIcon
.pixmap(*biggestSize)
.toImage();
}
} else { } else {
const auto biggestSize = systemIcon currentImageBack = Core::App().logo();
.availableSizes() }
.last();
if (currentImageBack.size() != desiredSize) {
_trayIconImageBack = systemIcon currentImageBack = currentImageBack.scaled(
.pixmap(biggestSize) desiredSize,
.toImage(); Qt::IgnoreAspectRatio,
Qt::SmoothTransformation);
} }
} else {
_trayIconImageBack = Core::App().logo();
} }
if (_trayIconImageBack.size() != desiredSize) { auto iconImage = currentImageBack;
_trayIconImageBack = _trayIconImageBack.scaled( TrayIconMuted = muted;
desiredSize, TrayIconCount = counterSlice;
Qt::IgnoreAspectRatio, TrayIconThemeName = iconThemeName;
Qt::SmoothTransformation); TrayIconName = iconName;
if (!qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
&& counter > 0) {
QPainter p(&iconImage);
int32 layerSize = -16;
if (iconSize >= 48) {
layerSize = -32;
} else if (iconSize >= 36) {
layerSize = -24;
} else if (iconSize >= 32) {
layerSize = -20;
}
auto &bg = muted
? st::trayCounterBgMute
: st::trayCounterBg;
auto &fg = st::trayCounterFg;
auto layer = App::wnd()->iconWithCounter(
layerSize,
counter,
bg,
fg,
false);
p.drawImage(
iconImage.width() - layer.width() - 1,
iconImage.height() - layer.height() - 1,
layer);
} }
result.addPixmap(App::pixmapFromImageInPlace(
std::move(iconImage)));
} }
_trayIconImage = _trayIconImageBack; TrayIcon = result;
_trayIconMuted = muted;
_trayIconCount = counterSlice;
_trayIconThemeName = iconThemeName;
_trayIconName = iconName;
if (!qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
&& counter > 0) {
QPainter p(&_trayIconImage);
int32 layerSize = -16;
if (_trayIconSize >= 48) {
layerSize = -32;
} else if (_trayIconSize >= 36) {
layerSize = -24;
} else if (_trayIconSize >= 32) {
layerSize = -20;
}
auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg);
auto &fg = st::trayCounterFg;
auto layer = App::wnd()->iconWithCounter(
layerSize,
counter,
bg,
fg,
false);
p.drawImage(
_trayIconImage.width() - layer.width() - 1,
_trayIconImage.height() - layer.height() - 1,
layer);
}
} }
return _trayIconImage; return TrayIcon;
} }
bool IsAppIndicator() { bool IsAppIndicator() {
@ -182,10 +223,7 @@ bool IsAppIndicator() {
static bool NeedTrayIconFile() { static bool NeedTrayIconFile() {
// Hack for indicator-application, which doesn't handle icons sent across D-Bus: // Hack for indicator-application, which doesn't handle icons sent across D-Bus:
// save the icon to a temp file and set the icon name to that filename. // save the icon to a temp file and set the icon name to that filename.
static const auto TrayIconFileNeeded = IsAppIndicator() static const auto TrayIconFileNeeded = IsAppIndicator();
// Ubuntu's tray extension doesn't zoom image data, but zooms image file
|| DesktopEnvironment::IsGnome();
return TrayIconFileNeeded; return TrayIconFileNeeded;
} }
@ -196,12 +234,14 @@ static inline QString TrayIconFileTemplate() {
} }
std::unique_ptr<QTemporaryFile> TrayIconFile( std::unique_ptr<QTemporaryFile> TrayIconFile(
const QImage &icon, QObject *parent) { const QIcon &icon,
int size,
QObject *parent) {
auto ret = std::make_unique<QTemporaryFile>( auto ret = std::make_unique<QTemporaryFile>(
TrayIconFileTemplate(), TrayIconFileTemplate(),
parent); parent);
ret->open(); ret->open();
icon.save(ret.get()); icon.pixmap(size).save(ret.get());
ret->close(); ret->close();
return ret; return ret;
} }
@ -279,8 +319,7 @@ void MainWindow::psTrayMenuUpdated() {
} }
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
void MainWindow::setSNITrayIcon( void MainWindow::setSNITrayIcon(const QIcon &icon) {
const QIcon &icon, const QImage &iconImage) {
const auto iconName = GetTrayIconName(); const auto iconName = GetTrayIconName();
if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8()) if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
@ -288,11 +327,13 @@ void MainWindow::setSNITrayIcon(
_sniTrayIcon->setIconByName(iconName); _sniTrayIcon->setIconByName(iconName);
_sniTrayIcon->setToolTipIconByName(iconName); _sniTrayIcon->setToolTipIconByName(iconName);
} else if (NeedTrayIconFile()) { } else if (NeedTrayIconFile()) {
_trayIconFile = TrayIconFile(iconImage, this); _trayIconFile = TrayIconFile(icon, 22, this);
_trayToolTipIconFile = TrayIconFile(icon, 48, this);
if (_trayIconFile) { if (_trayIconFile) {
_sniTrayIcon->setIconByName(_trayIconFile->fileName()); _sniTrayIcon->setIconByName(_trayIconFile->fileName());
_sniTrayIcon->setToolTipIconByName(_trayIconFile->fileName()); _sniTrayIcon->setToolTipIconByName(
_trayToolTipIconFile->fileName());
} }
} else { } else {
_sniTrayIcon->setIconByPixmap(icon); _sniTrayIcon->setIconByPixmap(icon);
@ -323,9 +364,6 @@ void MainWindow::attachToSNITrayIcon() {
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
void MainWindow::psSetupTrayIcon() { void MainWindow::psSetupTrayIcon() {
const auto iconImage = TrayIconImageGen();
const auto icon = QIcon(QPixmap::fromImage(iconImage));
if (IsSNIAvailable()) { if (IsSNIAvailable()) {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
LOG(("Using SNI tray icon.")); LOG(("Using SNI tray icon."));
@ -335,7 +373,7 @@ void MainWindow::psSetupTrayIcon() {
this); this);
_sniTrayIcon->setTitle(AppName.utf16()); _sniTrayIcon->setTitle(AppName.utf16());
setSNITrayIcon(icon, iconImage); setSNITrayIcon(TrayIconGen());
attachToSNITrayIcon(); attachToSNITrayIcon();
} }
@ -351,7 +389,7 @@ void MainWindow::psSetupTrayIcon() {
if (!trayIcon) { if (!trayIcon) {
trayIcon = new QSystemTrayIcon(this); trayIcon = new QSystemTrayIcon(this);
trayIcon->setIcon(icon); trayIcon->setIcon(TrayIconGen());
attachToTrayIcon(trayIcon); attachToTrayIcon(trayIcon);
} }
@ -420,17 +458,14 @@ void MainWindow::updateIconCounters() {
} }
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
const auto iconImage = TrayIconImageGen();
const auto icon = QIcon(QPixmap::fromImage(iconImage));
if (IsSNIAvailable()) { if (IsSNIAvailable()) {
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
if (_sniTrayIcon) { if (_sniTrayIcon) {
setSNITrayIcon(icon, iconImage); setSNITrayIcon(TrayIconGen());
} }
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
} else if (trayIcon) { } else if (trayIcon) {
trayIcon->setIcon(icon); trayIcon->setIcon(TrayIconGen());
} }
} }
@ -440,10 +475,6 @@ void MainWindow::LibsLoaded() {
qDBusRegisterMetaType<IconPixmap>(); qDBusRegisterMetaType<IconPixmap>();
qDBusRegisterMetaType<IconPixmapList>(); qDBusRegisterMetaType<IconPixmapList>();
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
if (DesktopEnvironment::IsKDE()) {
_trayIconSize = 48;
}
} }
void MainWindow::initTrayMenuHook() { void MainWindow::initTrayMenuHook() {

3
Telegram/SourceFiles/platform/linux/main_window_linux.h
View File

@ -68,8 +68,9 @@ private:
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
StatusNotifierItem *_sniTrayIcon = nullptr; StatusNotifierItem *_sniTrayIcon = nullptr;
std::unique_ptr<QTemporaryFile> _trayIconFile = nullptr; std::unique_ptr<QTemporaryFile> _trayIconFile = nullptr;
std::unique_ptr<QTemporaryFile> _trayToolTipIconFile = nullptr;
void setSNITrayIcon(const QIcon &icon, const QImage &iconImage); void setSNITrayIcon(const QIcon &icon);
void attachToSNITrayIcon(); void attachToSNITrayIcon();
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION