Skip to content

Commit

Permalink
Merge branch 'development' into MUSHclient
Browse files Browse the repository at this point in the history
  • Loading branch information
fiendish committed Mar 27, 2018
2 parents 25be5c3 + ea42e68 commit ab54eaf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions MUSHclient/AardwolfPackageChanges.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Aardwolf Client Package Major Changes List

r1978 snapshot
- bug fix: Make sure to draw the communication log's current tab contents after resize is released.

r1977 snapshot
- bug fix: The recent text printing slowdown in MUSHclient.exe should be fixed.
- new feature: The communication log plugin now has nextTab() and prevTab() functions for cycling to the next or previous tab. You can access them through the CallPlugin interface.
Expand Down
4 changes: 2 additions & 2 deletions MUSHclient/lua/text_rect.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function TextRect:addStyles(styles)
local urls = self:findURLs(strip_colours_from_styles(styles))

-- pop the oldest line from our buffer if we're at capacity
if self.num_raw_lines > self.max_lines then
if self.num_raw_lines >= self.max_lines then
table.remove(self.raw_lines, 1)
self.num_raw_lines = self.num_raw_lines - 1
end
Expand Down Expand Up @@ -282,6 +282,7 @@ function TextRect:clear()
self.raw_lines = {}
self.num_raw_lines = 0
self:reWrapLines()
self:draw()
end

function TextRect:reWrapLines()
Expand All @@ -307,7 +308,6 @@ function TextRect:reWrapLines()
self.display_start_line = start_line
self.end_line = math.max(1, math.min(start_line + self.rect_lines - 1, self.num_wrapped_lines))
self.display_end_line = self.end_line
self:draw()
end

function TextRect:drawLine(line, styles, backfill_start, backfill_end)
Expand Down
5 changes: 5 additions & 0 deletions MUSHclient/worlds/plugins/aard_channels_fiendish.xml
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,14 @@ lastRefresh = 0
function ResizeReleaseCallback ()
setupDisplay()
for i = 1,num_tabs do
tabs_rects[i]:reWrapLines()
end
tabs_rects[current_tab]:draw()
tabs_scrollbars[current_tab]:draw()
WindowMoveHotspot(win, "resize", draw_right-theme.RESIZER_SIZE, draw_bottom-theme.RESIZER_SIZE, 0, 0)
end
Expand Down

0 comments on commit ab54eaf

Please sign in to comment.