nglcd: changed last commit

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1850d91f71
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2023-08-14 (Mon, 14 Aug 2023)


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

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2023-08-14 22:59:47 +02:00
committed by vanhofen
parent bde67131c6
commit 58af6e03e9

View File

@@ -1021,8 +1021,8 @@ void cGLCD::Run(void)
Channel = g_Locale->getText(LOCALE_GLCD_VOLUME); Channel = g_Locale->getText(LOCALE_GLCD_VOLUME);
ChannelWidth = font_channel.Width(Channel); ChannelWidth = font_channel.Width(Channel);
doScrollChannel = ChannelWidth > bitmap->Width(); doScrollChannel = ChannelWidth > bitmap->Width();
scrollChannelSkip = 0;
scrollChannelForward = true; scrollChannelForward = true;
scrollChannelSkip = 0;
if (doScrollChannel) { if (doScrollChannel) {
scrollChannelOffset = bitmap->Width()/4; scrollChannelOffset = bitmap->Width()/4;
ChannelWidth += scrollChannelOffset; ChannelWidth += scrollChannelOffset;
@@ -1031,8 +1031,8 @@ void cGLCD::Run(void)
scrollChannelOffset = 0; scrollChannelOffset = 0;
} }
EpgWidth = 0; EpgWidth = 0;
scrollEpgSkip = 0;
scrollEpgForward = true; scrollEpgForward = true;
scrollEpgSkip = 0;
Scale = g_settings.current_volume; Scale = g_settings.current_volume;
channel_id = -1; channel_id = -1;
} }
@@ -1045,8 +1045,8 @@ void cGLCD::Run(void)
Epg = stagingEpg; Epg = stagingEpg;
EpgWidth = font_epg.Width(Epg); EpgWidth = font_epg.Width(Epg);
doScrollEpg = EpgWidth > bitmap->Width(); doScrollEpg = EpgWidth > bitmap->Width();
scrollEpgSkip = 0;
scrollEpgForward = true; scrollEpgForward = true;
scrollEpgSkip = 0;
if (doScrollEpg) if (doScrollEpg)
{ {
scrollEpgOffset = bitmap->Width()/4; scrollEpgOffset = bitmap->Width()/4;
@@ -1060,8 +1060,8 @@ void cGLCD::Run(void)
Channel = stagingChannel; Channel = stagingChannel;
ChannelWidth = font_channel.Width(Channel); ChannelWidth = font_channel.Width(Channel);
doScrollChannel = ChannelWidth > bitmap->Width(); doScrollChannel = ChannelWidth > bitmap->Width();
scrollChannelSkip = 0;
scrollChannelForward = true; scrollChannelForward = true;
scrollChannelSkip = 0;
if (doScrollChannel) if (doScrollChannel)
{ {
scrollChannelOffset = bitmap->Width()/4; scrollChannelOffset = bitmap->Width()/4;
@@ -1171,13 +1171,16 @@ void cGLCD::Run(void)
#if 0 // FIXME: scroll problem, high load #if 0 // FIXME: scroll problem, high load
doScrollEpg = EpgWidth > bitmap->Width(); doScrollEpg = EpgWidth > bitmap->Width();
scrollEpgForward = true; scrollEpgForward = true;
#else
doScrollEpg = false;
scrollEpgForward = false;
#endif
scrollEpgSkip = 0; scrollEpgSkip = 0;
if (doScrollEpg) if (doScrollEpg)
{ {
scrollEpgOffset = bitmap->Width()/4; scrollEpgOffset = bitmap->Width()/4;
EpgWidth += scrollEpgOffset; EpgWidth += scrollEpgOffset;
} else } else
#endif
scrollEpgOffset = 0; scrollEpgOffset = 0;
} }
} }