Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Nov 9, 2022
2 parents 4d86a2a + 69c084d commit 4e68b81
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

- Added horizontal and vertical padding options for messages.
- Fixed an issue where messages' background gradient wouldn't resize properly.
- Fixed an issue where fast forwarding would break the message display.
- Fixed an issue where fasting forward would break the message display.
- Reduced the minimal possible chat frame size to 176x64, making it smaller will break stuff.
The max is uncapped.
- Added French translation. Translated by Braincell1980@Curse.
Expand Down
6 changes: 3 additions & 3 deletions ls_Glass/core/components/slidingmessageframe.lua
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,11 @@ function object_proto:FastForward()
t_wipe(self.incomingMessages)

local num = m_min(self:GetNumHistoryElements(), self:GetMaxMessages(), self:GetFirstMessageIndex())
if num == 0 then return end

self:SetVerticalScroll(0)
self:ScrollTo(num, true)
self:ScrollTo(num)

if num == 0 then return end
if num == self:GetFirstMessageIndex() then
num = num + 1
end
Expand All @@ -410,7 +410,7 @@ function object_proto:FastForward()
end
end

self:ProcessIncoming(messages, true)
self:ProcessIncoming(messages, false)
self:SetFirstMessageIndex(0)
end
end
Expand Down

0 comments on commit 4e68b81

Please sign in to comment.