From 11d67ec6ae6cbb1158f195dfa5a6f4e08e4913cd Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Aug 2010 20:21:13 +0000 Subject: [PATCH] Fix updating of the scroll bar after opening a new file. Originally committed to SVN as r4726. --- aegisub/src/base_grid.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp index 45e738999..80a22036c 100644 --- a/aegisub/src/base_grid.cpp +++ b/aegisub/src/base_grid.cpp @@ -946,7 +946,6 @@ void BaseGrid::AdjustScrollbar() { int drawPerScreen = h/lineHeight; int rows = GetRows(); bool barToEnable = drawPerScreen < rows+2; - bool barEnabled = scrollBar->IsEnabled(); yPos = MID(0,yPos,rows - drawPerScreen); @@ -954,10 +953,10 @@ void BaseGrid::AdjustScrollbar() { scrollBar->GetSize(&sw,&sh); scrollBar->SetSize(w-sw,0,sw,h); - if (barEnabled) { + if (barToEnable != scrollBar->IsEnabled()) scrollBar->Enable(barToEnable); + if (barToEnable) { scrollBar->SetScrollbar(yPos,drawPerScreen,rows+2,drawPerScreen-2,true); } - if (barToEnable != barEnabled) scrollBar->Enable(barToEnable); scrollBar->Thaw(); }