Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-05-07 06:26:07 +02:00
Code Issues Packages Projects Releases Activity

Fix unread/new count

Browse Source
This commit is contained in:
Ximi1970
2023-08-26 12:28:37 +02:00
parent 6cbf0460a8
commit c2841c5880
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/SysTray-X/SysTray-X-app/systrayxicon.cpp
View File

@@ -303,8 +303,18 @@ void SysTrayXIcon::setMailCount( int unread_mail, int new_mail )
void SysTrayXIcon::renderIcon()
{
QPixmap pixmap;
int count;
if( m_unread_mail > 0 || m_new_mail > 0 )
if( m_pref->getCountType() == Preferences::PREF_COUNT_UNREAD )
{
count = m_unread_mail;
}
else
{
count = m_new_mail;
}
if( count > 0 )
{
switch( m_icon_type )
{
@@ -394,7 +404,7 @@ void SysTrayXIcon::renderIcon()
}
}
if( m_show_number && ( m_unread_mail > 0 || m_new_mail > 0 ) )
if( m_show_number && count > 0 )
{
/*
* Paint the number
@@ -417,9 +427,7 @@ void SysTrayXIcon::renderIcon()
QRect bounding = pixmap.rect().adjusted( m_number_margins.left(), m_number_margins.top(),
-m_number_margins.right(), -m_number_margins.bottom());
// TODO: check pref for type
painter.drawText( bounding, m_number_alignment, QString::number( m_unread_mail ) );
painter.drawText( bounding, m_number_alignment, QString::number( count ) );
}
/*

19
app/SysTray-X/SysTray-X-app/systrayxstatusnotifier.cpp
View File

@@ -349,8 +349,18 @@ void SysTrayXStatusNotifier::setMailCount( int unread_mail, int new_mail )
void SysTrayXStatusNotifier::renderIcon()
{
QPixmap pixmap;
int count;
if( m_unread_mail > 0 || m_new_mail > 0 )
if( m_pref->getCountType() == Preferences::PREF_COUNT_UNREAD )
{
count = m_unread_mail;
}
else
{
count = m_new_mail;
}
if( count > 0 )
{
switch( m_icon_type )
{
@@ -439,7 +449,7 @@ void SysTrayXStatusNotifier::renderIcon()
}
}
if( m_show_number && ( m_unread_mail > 0 || m_new_mail > 0 ) )
if( m_show_number && count > 0 )
{
/*
* Paint the number
@@ -462,8 +472,7 @@ void SysTrayXStatusNotifier::renderIcon()
QRect bounding = pixmap.rect().adjusted( m_number_margins.left(), m_number_margins.top(),
-m_number_margins.right(), -m_number_margins.bottom());
// TODO pref to get the type
painter.drawText( bounding, m_number_alignment, QString::number( m_unread_mail ) );
painter.drawText( bounding, m_number_alignment, QString::number( count ) );
}
/*
@@ -474,7 +483,7 @@ void SysTrayXStatusNotifier::renderIcon()
/*
* Hide the icon?
*/
if( m_hide_default_icon && m_unread_mail == 0 && m_new_mail == 0 )
if( m_hide_default_icon && count == 0 )
{
setStatus( KStatusNotifierItem::ItemStatus::Passive );
}