From df18df674c51e89e74be4a458d7ffe5f36ceb025 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 4 Jul 2020 13:47:12 +0200 Subject: [PATCH] glcd: don't depend initial scroll offset from scroll spreed Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4e0bf5592e0ded3607c54430fc7eb1be95b5cb87 Author: vanhofen Date: 2020-07-04 (Sat, 04 Jul 2020) Origin message was: ------------------ - glcd: don't depend initial scroll offset from scroll spreed ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/glcd/glcd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 1a6af5eee..9a798d52d 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -959,7 +959,7 @@ void cGLCD::Run(void) scrollEpgSkip = 0; scrollEpgForward = true; if (doScrollEpg) { - scrollEpgOffset = bitmap->Width()/g_settings.glcd_scroll_speed; + scrollEpgOffset = bitmap->Width()/4; EpgWidth += scrollEpgOffset; } else @@ -980,7 +980,7 @@ void cGLCD::Run(void) scrollChannelSkip = 0; scrollChannelForward = true; if (doScrollChannel) { - scrollChannelOffset = bitmap->Width()/g_settings.glcd_scroll_speed; + scrollChannelOffset = bitmap->Width()/4; ChannelWidth += scrollChannelOffset; } else @@ -1005,7 +1005,7 @@ void cGLCD::Run(void) scrollEpgForward = true; if (doScrollEpg) { - scrollEpgOffset = bitmap->Width()/g_settings.glcd_scroll_speed; + scrollEpgOffset = bitmap->Width()/4; EpgWidth += scrollEpgOffset; } else @@ -1020,7 +1020,7 @@ void cGLCD::Run(void) scrollChannelForward = true; if (doScrollChannel) { - scrollChannelOffset = bitmap->Width()/g_settings.glcd_scroll_speed; + scrollChannelOffset = bitmap->Width()/4; ChannelWidth += scrollChannelOffset; } else @@ -1050,7 +1050,7 @@ void cGLCD::Run(void) scrollChannelForward = true; scrollChannelSkip = 0; if (doScrollChannel) { - scrollChannelOffset = bitmap->Width()/g_settings.glcd_scroll_speed; + scrollChannelOffset = bitmap->Width()/4; ChannelWidth += scrollChannelOffset; } else @@ -1072,7 +1072,7 @@ void cGLCD::Run(void) scrollEpgSkip = 0; if (doScrollEpg) { - scrollEpgOffset = bitmap->Width()/g_settings.glcd_scroll_speed; + scrollEpgOffset = bitmap->Width()/4; EpgWidth += scrollEpgOffset; } else scrollEpgOffset = 0;