gimp r26390 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Tue Aug  5 17:17:27 2008
New Revision: 26390
URL: http://svn.gnome.org/viewvc/gimp?rev=26390&view=rev

Log:
2008-08-05  Martin Nordholts  <martinn svn gnome org>

	* app/display/gimpdisplayshell-scale.c
	(gimp_display_shell_scale_setup): Don't setup scrollbar step
	increment here.

	* app/display/gimpdisplayshell-scroll.c
	(gimp_display_shell_setup_hscrollbar_with_value)
	(gimp_display_shell_setup_vscrollbar_with_value): Setup scrollbar
	step increment here and make sure that a step always scrolls at
	least a display shell pixel.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-scale.c
   trunk/app/display/gimpdisplayshell-scroll.c

Modified: trunk/app/display/gimpdisplayshell-scale.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.c	(original)
+++ trunk/app/display/gimpdisplayshell-scale.c	Tue Aug  5 17:17:27 2008
@@ -124,7 +124,6 @@
   shell->hsbdata->value          = shell->offset_x;
   shell->hsbdata->page_size      = shell->disp_width;
   shell->hsbdata->page_increment = shell->disp_width / 2;
-  shell->hsbdata->step_increment = shell->scale_x;
 
   gimp_display_shell_setup_hscrollbar_with_value (shell, shell->offset_x);
 
@@ -136,7 +135,6 @@
   shell->vsbdata->value          = shell->offset_y;
   shell->vsbdata->page_size      = shell->disp_height;
   shell->vsbdata->page_increment = shell->disp_height / 2;
-  shell->vsbdata->step_increment = shell->scale_y;
 
   gimp_display_shell_setup_vscrollbar_with_value (shell, shell->offset_y);
 

Modified: trunk/app/display/gimpdisplayshell-scroll.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scroll.c	(original)
+++ trunk/app/display/gimpdisplayshell-scroll.c	Tue Aug  5 17:17:27 2008
@@ -420,6 +420,8 @@
       shell->hsbdata->upper = MAX (value + shell->disp_width,
                                    sw + (shell->disp_width - sw) / 2);
     }
+
+  shell->hsbdata->step_increment = MAX (shell->scale_x, 1.0);
 }
 
 /**
@@ -460,4 +462,6 @@
       shell->vsbdata->upper = MAX (value + shell->disp_height,
                                    sh + (shell->disp_height - sh) / 2);
     }
+
+  shell->vsbdata->step_increment = MAX (shell->scale_y, 1.0);
 }