From c75ff524bfc8e951a462bca763bb817fb6299f35 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Fri, 20 Jun 2008 13:29:25 +0000 Subject: [PATCH] Fix ScrollBarAsNeeded git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25338 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiWorkArea.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index f433d752e6..67f86552d8 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -314,7 +314,7 @@ GuiWorkArea::~GuiWorkArea() void GuiWorkArea::fixVerticalScrollBar() { if (!isFullScreen()) - setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); } @@ -569,13 +569,13 @@ void GuiWorkArea::toggleCursor() void GuiWorkArea::updateScrollbar() { ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters(); - - // Block the scrollbar signal to prevent recursive signal/slot calling. - verticalScrollBar()->blockSignals(true); + // WARNING: don't touch at the scrollbar value like this: + // verticalScrollBar()->setValue(scroll_.position); + // because this would cause a recursive signal/slot calling with + // GuiWorkArea::scrollTo verticalScrollBar()->setRange(scroll_.min, scroll_.max); verticalScrollBar()->setPageStep(scroll_.page_step); verticalScrollBar()->setSingleStep(scroll_.single_step); - verticalScrollBar()->setValue(scroll_.position); verticalScrollBar()->setSliderPosition(scroll_.position); verticalScrollBar()->blockSignals(false); } -- 2.39.2