From 3dfad85645b35ce410efac2f3c5b551419520394 Mon Sep 17 00:00:00 2001 From: Jason Chu Date: Tue, 15 May 2012 09:51:58 -0700 Subject: Fix support for disabling scrolling --- awesompd.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/awesompd.lua b/awesompd.lua index faa1a97..b0be721 100644 --- a/awesompd.lua +++ b/awesompd.lua @@ -833,18 +833,20 @@ end -- Scroll the given text by the current number of symbols. function awesompd:scroll_text(text) local result = text - if self.output_size < utf8len(text) then - text = text .. " - " - if self.scroll_pos + self.output_size - 1 > utf8len(text) then - result = utf8sub(text, self.scroll_pos) - result = result .. utf8sub(text, 1, self.scroll_pos + self.output_size - 1 - utf8len(text)) - self.scroll_pos = self.scroll_pos + 1 - if self.scroll_pos > utf8len(text) then - self.scroll_pos = 1 - end - else - result = utf8sub(text, self.scroll_pos, self.scroll_pos + self.output_size - 1) - self.scroll_pos = self.scroll_pos + 1 + if self.scrolling then + if self.output_size < utf8len(text) then + text = text .. " - " + if self.scroll_pos + self.output_size - 1 > utf8len(text) then + result = utf8sub(text, self.scroll_pos) + result = result .. utf8sub(text, 1, self.scroll_pos + self.output_size - 1 - utf8len(text)) + self.scroll_pos = self.scroll_pos + 1 + if self.scroll_pos > utf8len(text) then + self.scroll_pos = 1 + end + else + result = utf8sub(text, self.scroll_pos, self.scroll_pos + self.output_size - 1) + self.scroll_pos = self.scroll_pos + 1 + end end end return result -- cgit v1.2.3