gimp r26480 - in trunk: . app/display
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26480 - in trunk: . app/display
- Date: Sun, 10 Aug 2008 11:11:19 +0000 (UTC)
Author: martinn
Date: Sun Aug 10 11:11:19 2008
New Revision: 26480
URL: http://svn.gnome.org/viewvc/gimp?rev=26480&view=rev
Log:
2008-08-10 Martin Nordholts <martinn svn gnome org>
* app/display/gimpdisplayshell-scroll.[ch]: Renamed
gimp_display_shell_scroll_private() to gimp_display_shell_scroll()
and keep it here.
* app/display/gimpdisplayshell-private.h: Removed.
* app/display/Makefile.am
* app/display/gimpdisplayshell-scale.c
* app/display/gimpdisplayshell-scroll.c
* app/display/gimpdisplayshell-handlers.c
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-autoscroll.c: Adapt.
Removed:
trunk/app/display/gimpdisplayshell-private.h
Modified:
trunk/ChangeLog
trunk/app/display/Makefile.am
trunk/app/display/gimpdisplayshell-autoscroll.c
trunk/app/display/gimpdisplayshell-callbacks.c
trunk/app/display/gimpdisplayshell-handlers.c
trunk/app/display/gimpdisplayshell-scale.c
trunk/app/display/gimpdisplayshell-scroll.c
trunk/app/display/gimpdisplayshell-scroll.h
Modified: trunk/app/display/Makefile.am
==============================================================================
--- trunk/app/display/Makefile.am (original)
+++ trunk/app/display/Makefile.am Sun Aug 10 11:11:19 2008
@@ -45,7 +45,6 @@
gimpdisplayshell-icon.h \
gimpdisplayshell-preview.c \
gimpdisplayshell-preview.h \
- gimpdisplayshell-private.h \
gimpdisplayshell-progress.c \
gimpdisplayshell-progress.h \
gimpdisplayshell-render.c \
Modified: trunk/app/display/gimpdisplayshell-autoscroll.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-autoscroll.c (original)
+++ trunk/app/display/gimpdisplayshell-autoscroll.c Sun Aug 10 11:11:19 2008
@@ -26,7 +26,6 @@
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-autoscroll.h"
#include "gimpdisplayshell-coords.h"
-#include "gimpdisplayshell-private.h"
#include "gimpdisplayshell-scroll.h"
#include "gimpdisplayshell-transform.h"
@@ -136,9 +135,9 @@
info->time += AUTOSCROLL_DT;
- gimp_display_shell_scroll_private (shell,
- AUTOSCROLL_DX * (gdouble) dx,
- AUTOSCROLL_DX * (gdouble) dy);
+ gimp_display_shell_scroll (shell,
+ AUTOSCROLL_DX * (gdouble) dx,
+ AUTOSCROLL_DX * (gdouble) dy);
gimp_display_shell_untransform_coordinate (shell,
&device_coords,
Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c (original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c Sun Aug 10 11:11:19 2008
@@ -67,7 +67,6 @@
#include "gimpdisplayshell-draw.h"
#include "gimpdisplayshell-layer-select.h"
#include "gimpdisplayshell-preview.h"
-#include "gimpdisplayshell-private.h"
#include "gimpdisplayshell-scale.h"
#include "gimpdisplayshell-scroll.h"
#include "gimpdisplayshell-selection.h"
@@ -1110,11 +1109,11 @@
if (shell->scrolling)
{
- gimp_display_shell_scroll_private (shell,
- (shell->scroll_start_x - mevent->x -
- shell->offset_x),
- (shell->scroll_start_y - mevent->y -
- shell->offset_y));
+ gimp_display_shell_scroll (shell,
+ (shell->scroll_start_x - mevent->x -
+ shell->offset_x),
+ (shell->scroll_start_y - mevent->y -
+ shell->offset_y));
}
else if (state & GDK_BUTTON1_MASK)
{
@@ -1665,20 +1664,20 @@
gimp_display_shell_vscrollbar_update (GtkAdjustment *adjustment,
GimpDisplayShell *shell)
{
- gimp_display_shell_scroll_private (shell,
- 0,
- gtk_adjustment_get_value (adjustment) -
- shell->offset_y);
+ gimp_display_shell_scroll (shell,
+ 0,
+ gtk_adjustment_get_value (adjustment) -
+ shell->offset_y);
}
static void
gimp_display_shell_hscrollbar_update (GtkAdjustment *adjustment,
GimpDisplayShell *shell)
{
- gimp_display_shell_scroll_private (shell,
- gtk_adjustment_get_value (adjustment) -
- shell->offset_x,
- 0);
+ gimp_display_shell_scroll (shell,
+ gtk_adjustment_get_value (adjustment) -
+ shell->offset_x,
+ 0);
}
static gboolean
Modified: trunk/app/display/gimpdisplayshell-handlers.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-handlers.c (original)
+++ trunk/app/display/gimpdisplayshell-handlers.c Sun Aug 10 11:11:19 2008
@@ -499,7 +499,7 @@
gint scaled_previous_origin_x = SCALEX (shell, previous_origin_x);
gint scaled_previous_origin_y = SCALEY (shell, previous_origin_y);
- /* Note that we can't use gimp_display_shell_scroll_private() here
+ /* Note that we can't use gimp_display_shell_scroll() here
* because that would expose the image twice, causing unwanted
* flicker.
*/
Modified: trunk/app/display/gimpdisplayshell-scale.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.c (original)
+++ trunk/app/display/gimpdisplayshell-scale.c Sun Aug 10 11:11:19 2008
@@ -38,7 +38,6 @@
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
-#include "gimpdisplayshell-private.h"
#include "gimpdisplayshell-scale.h"
#include "gimpdisplayshell-scroll.h"
#include "gimpdisplayshell-title.h"
Modified: trunk/app/display/gimpdisplayshell-scroll.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scroll.c (original)
+++ trunk/app/display/gimpdisplayshell-scroll.c Sun Aug 10 11:11:19 2008
@@ -37,7 +37,6 @@
#include "gimpdisplay-foreach.h"
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-draw.h"
-#include "gimpdisplayshell-private.h"
#include "gimpdisplayshell-scale.h"
#include "gimpdisplayshell-scroll.h"
@@ -70,15 +69,15 @@
offset_to_apply_x = scaled_image_x - shell->disp_width / 2 - shell->offset_x;
offset_to_apply_y = scaled_image_y - shell->disp_height / 2 - shell->offset_y;
- gimp_display_shell_scroll_private (shell,
- offset_to_apply_x,
- offset_to_apply_y);
+ gimp_display_shell_scroll (shell,
+ offset_to_apply_x,
+ offset_to_apply_y);
}
void
-gimp_display_shell_scroll_private (GimpDisplayShell *shell,
- gint x_offset,
- gint y_offset)
+gimp_display_shell_scroll (GimpDisplayShell *shell,
+ gint x_offset,
+ gint y_offset)
{
gint old_x;
gint old_y;
@@ -242,7 +241,7 @@
target_offset_y = (sh - shell->disp_height) / 2;
}
- /* Note that we can't use gimp_display_shell_scroll_private() here
+ /* Note that we can't use gimp_display_shell_scroll() here
* because that would expose the image twice, causing unwanted
* flicker.
*/
Modified: trunk/app/display/gimpdisplayshell-scroll.h
==============================================================================
--- trunk/app/display/gimpdisplayshell-scroll.h (original)
+++ trunk/app/display/gimpdisplayshell-scroll.h Sun Aug 10 11:11:19 2008
@@ -23,40 +23,34 @@
void gimp_display_shell_scroll_center_image_coordinate (GimpDisplayShell *shell,
gdouble image_x,
gdouble image_y);
-
+void gimp_display_shell_scroll (GimpDisplayShell *shell,
+ gint x_offset,
+ gint y_offset);
void gimp_display_shell_scroll_clamp_offsets (GimpDisplayShell *shell);
-
void gimp_display_shell_scroll_center_image (GimpDisplayShell *shell,
gboolean horizontally,
gboolean vertically);
-
void gimp_display_shell_scroll_center_image_on_next_size_allocate
(GimpDisplayShell *shell);
-
void gimp_display_shell_scroll_get_scaled_viewport (const GimpDisplayShell *shell,
gint *x,
gint *y,
gint *w,
gint *h);
-
void gimp_display_shell_scroll_get_viewport (const GimpDisplayShell *shell,
gdouble *x,
gdouble *y,
gdouble *w,
gdouble *h);
-
void gimp_display_shell_scroll_get_scaled_viewport_offset (const GimpDisplayShell *shell,
gint *x,
gint *y);
-
void gimp_display_shell_scroll_get_disp_offset (const GimpDisplayShell *shell,
gint *disp_xoffset,
gint *disp_yoffset);
-
void gimp_display_shell_scroll_get_render_start_offset (const GimpDisplayShell *shell,
gint *offset_x,
gint *offset_y);
-
void gimp_display_shell_scroll_setup_hscrollbar (GimpDisplayShell *shell,
gdouble value);
void gimp_display_shell_scroll_setup_vscrollbar (GimpDisplayShell *shell,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
