mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

glcd: rework

Browse Source 
contains:
84e96916bf
0391fe435e
9fdbdc8717
3d1f5b6a8a


Origin commit data
------------------
Branch: ni/coolstream
Commit: d52813cf67
Author: TangoCash <eric@loxat.de>
Date: 2022-11-15 (Tue, 15 Nov 2022)

Origin message was:
------------------
- glcd: rework

contains:
84e96916bf
0391fe435e
9fdbdc8717
3d1f5b6a8a


------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2022-11-15 22:43:21 +01:00
committed by vanhofen
parent 106f60dbb4
commit 5f251b06bc
16 changed files with 414 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/glcd/digitalclock.cpp
View File

@@ -130,7 +130,8 @@ found:
void RenderTimeDigit(int _digit, int x, int y)
{
cGLCD *cglcd = cGLCD::getInstance();
if (g_settings.glcd_standby_weather)
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
if (t.glcd_standby_weather)
cglcd->imageShow(digit[_digit], x, y, 0, 0, false, false, false, false, false);
else
cglcd->imageShow(digit[_digit], x, y, 0, 0, false, false, false, false, true);
@@ -139,7 +140,8 @@ void RenderTimeDigit(int _digit, int x, int y)
void RenderDots(int x, int y)
{
cGLCD *cglcd = cGLCD::getInstance();
if (g_settings.glcd_standby_weather)
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
if (t.glcd_standby_weather)
cglcd->imageShow(digit[TIME_DOTS], x, y, 0, 0, false, false, false, true, false);
else
cglcd->imageShow(digit[TIME_DOTS], x, y, 0, 0, false, false, false, true, true);
@@ -149,7 +151,7 @@ void ShowDigitalClock(int hour, int minute)
{
cGLCD *cglcd = cGLCD::getInstance();
SNeutrinoGlcdTheme &t = g_settings.glcd_theme;
int y = g_settings.glcd_standby_weather ? t.glcd_standby_clock_digital_y_position : cglcd->bitmap->Height() / 2;
int y = t.glcd_standby_weather ? t.glcd_standby_clock_digital_y_position : cglcd->bitmap->Height() / 2;
int a = 10;
int b = 117;
@@ -159,7 +161,7 @@ void ShowDigitalClock(int hour, int minute)
RenderTimeDigit(hour/10, a, y);
RenderTimeDigit(hour%10, b, y);
RenderDots(c ,(g_settings.glcd_standby_weather ? (y + 35) : y));
RenderDots(c ,(t.glcd_standby_weather ? (y + 35) : y));
RenderTimeDigit(minute/10, d, y);
RenderTimeDigit(minute%10, e, y);
}