mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

screensaver: rework timeosd handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ac78c0c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-07 (Thu, 07 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-01-07 22:36:10 +01:00
parent 291e699330
commit 7be34438f6
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/timeosd.cpp
View File

@@ -33,7 +33,7 @@
#include <neutrino.h>
#include <gui/volumebar.h>
#include <gui/timeosd.h>
#include "screensaver.h"
CTimeOSD::CTimeOSD():CComponentsFrmClock( 1, 1, NULL, "%H:%M:%S", NULL, false, 1, NULL, CC_SHADOW_ON, COL_LIGHT_GRAY, COL_MENUCONTENT_PLUS_0,COL_MENUCONTENTDARK_PLUS_0)
@@ -96,7 +96,7 @@ void CTimeOSD::initTimeString()
void CTimeOSD::show(time_t time_show, bool force)
{
time_show /= 1000;
if (!force && (m_mode == MODE_HIDE || m_time_show == time_show))
if (!force && (m_mode == MODE_HIDE || m_time_show == time_show) || CScreenSaver::getInstance()->IsRun())
return;
m_time_show = time_show;