From b90de8c582b41bbb3af5f77df69ae537e106ce59 Mon Sep 17 00:00:00 2001 From: neoraider Date: Tue, 15 Apr 2008 21:47:03 +0000 Subject: zoomedit: * Some scrolling tweaks --- src/Gui/RenderArea.cpp | 10 ++++------ src/Gui/RenderArea.h | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/Gui') diff --git a/src/Gui/RenderArea.cpp b/src/Gui/RenderArea.cpp index 4d250f8..8062b80 100644 --- a/src/Gui/RenderArea.cpp +++ b/src/Gui/RenderArea.cpp @@ -193,15 +193,13 @@ void RenderArea::updateScrollbars(float x, float y) { get_window()->thaw_updates(); - updateScrollingWithSize(2*xVal, 2*yVal); + updateScrolling(); } void RenderArea::updateScrolling() { - updateScrollingWithSize(hScrollbar->get_adjustment()->get_upper()-hScrollbar->get_adjustment()->get_lower(), - vScrollbar->get_adjustment()->get_upper()-vScrollbar->get_adjustment()->get_lower()); -} - -void RenderArea::updateScrollingWithSize(float imageWidth, float imageHeight) { + const float imageWidth = hScrollbar->get_adjustment()->get_upper()-hScrollbar->get_adjustment()->get_lower(); + const float imageHeight = vScrollbar->get_adjustment()->get_upper()-vScrollbar->get_adjustment()->get_lower(); + if(hScrollbar) { if(imageWidth < getViewWidth()) xCenter = 0; diff --git a/src/Gui/RenderArea.h b/src/Gui/RenderArea.h index 61e5291..59498d4 100644 --- a/src/Gui/RenderArea.h +++ b/src/Gui/RenderArea.h @@ -79,7 +79,6 @@ class RenderArea : public Gtk::DrawingArea { void updateViewport(); void updateScrollbars(float x = 0.5f, float y = 0.5f); void updateScrolling(); - void updateScrollingWithSize(float imageWidth, float imageHeight); bool gdkGLBegin() { GtkWidget *widget = GTK_WIDGET(gobj()); -- cgit v1.2.3