[gthumb] fixed indentation broken by the previous commit
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] fixed indentation broken by the previous commit
- Date: Tue, 25 Oct 2011 14:53:29 +0000 (UTC)
commit 9dfbc0946aa6538544c1c1fc486123fa6e3edb7b
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Oct 16 11:49:26 2011 +0200
fixed indentation broken by the previous commit
.../contact_sheet/gth-contact-sheet-creator.c | 20 +-
extensions/contact_sheet/gth-contact-sheet-theme.c | 12 +-
extensions/contact_sheet/gth-contact-sheet-theme.h | 4 +-
extensions/file_tools/cairo-rotate.c | 10 +-
extensions/file_tools/cairo-rotate.h | 32 +-
extensions/file_tools/gth-file-tool-crop.c | 14 +-
extensions/file_tools/gth-file-tool-rotate.c | 24 +-
extensions/file_tools/gth-image-line-tool.c | 28 +-
extensions/file_tools/gth-image-rotator.c | 68 +++---
extensions/file_tools/gth-image-rotator.h | 2 +-
gthumb/cairo-utils.c | 4 +-
gthumb/cairo-utils.h | 134 +++++-----
gthumb/gth-cell-renderer-thumbnail.c | 34 ++--
gthumb/gth-image-navigator.c | 20 +-
gthumb/gth-image-selector.c | 146 +++++-----
gthumb/gth-image-selector.h | 64 ++--
gthumb/gth-image-viewer.c | 30 +-
gthumb/gth-image-viewer.h | 300 ++++++++++----------
gthumb/gth-menu-button.c | 14 +-
gthumb/gth-time-selector.c | 20 +-
gthumb/gth-toggle-menu-tool-button.c | 18 +-
gthumb/gtk-utils.c | 2 +-
22 files changed, 500 insertions(+), 500 deletions(-)
---
diff --git a/extensions/contact_sheet/gth-contact-sheet-creator.c b/extensions/contact_sheet/gth-contact-sheet-creator.c
index 5cd0dcb..6946121 100644
--- a/extensions/contact_sheet/gth-contact-sheet-creator.c
+++ b/extensions/contact_sheet/gth-contact-sheet-creator.c
@@ -544,8 +544,8 @@ paint_footer (GthContactSheetCreator *self,
static void
paint_frame (GthContactSheetCreator *self,
- cairo_rectangle_int_t *frame_rect,
- cairo_rectangle_int_t *image_rect,
+ cairo_rectangle_int_t *frame_rect,
+ cairo_rectangle_int_t *image_rect,
GthFileData *file_data)
{
gth_contact_sheet_theme_paint_frame (self->priv->theme, self->priv->cr, frame_rect, image_rect);
@@ -589,7 +589,7 @@ paint_frame (GthContactSheetCreator *self,
static void
paint_image (GthContactSheetCreator *self,
- cairo_rectangle_int_t *image_rect,
+ cairo_rectangle_int_t *image_rect,
GdkPixbuf *image)
{
cairo_save (self->priv->cr);
@@ -702,12 +702,12 @@ export (GthContactSheetCreator *self)
x = self->priv->theme->col_spacing;
for (scan_row = first_item; scan_row != last_item; scan_row = scan_row->next) {
- ItemData *row_item = scan_row->data;
- int frame_width;
- int frame_height;
+ ItemData *row_item = scan_row->data;
+ int frame_width;
+ int frame_height;
cairo_rectangle_int_t frame_rect;
- int text_y;
- int i;
+ int text_y;
+ int i;
frame_width = self->priv->thumb_width + (self->priv->theme->frame_hpadding * 2);
frame_height = self->priv->thumb_height + (self->priv->theme->frame_vpadding * 2);
@@ -719,8 +719,8 @@ export (GthContactSheetCreator *self)
/* paint the thumbnail */
if (row_item->thumbnail != NULL) {
- int thumbnail_width;
- int thumbnail_height;
+ int thumbnail_width;
+ int thumbnail_height;
cairo_rectangle_int_t image_rect;
thumbnail_width = gdk_pixbuf_get_width (row_item->thumbnail);
diff --git a/extensions/contact_sheet/gth-contact-sheet-theme.c b/extensions/contact_sheet/gth-contact-sheet-theme.c
index 2d411ba..a965c48 100644
--- a/extensions/contact_sheet/gth-contact-sheet-theme.c
+++ b/extensions/contact_sheet/gth-contact-sheet-theme.c
@@ -275,10 +275,10 @@ gth_contact_sheet_theme_paint_background (GthContactSheetTheme *theme,
void
-gth_contact_sheet_theme_paint_frame (GthContactSheetTheme *theme,
- cairo_t *cr,
- cairo_rectangle_int_t *frame_rect,
- cairo_rectangle_int_t *image_rect)
+gth_contact_sheet_theme_paint_frame (GthContactSheetTheme *theme,
+ cairo_t *cr,
+ cairo_rectangle_int_t *frame_rect,
+ cairo_rectangle_int_t *image_rect)
{
int width;
@@ -487,7 +487,7 @@ paint_text (GthContactSheetTheme *theme,
static void
paint_thumbnail (GthContactSheetTheme *theme,
cairo_t *cr,
- cairo_rectangle_int_t *image_rect,
+ cairo_rectangle_int_t *image_rect,
double font_scale)
{
cairo_rectangle_int_t frame_rect;
@@ -536,7 +536,7 @@ gth_contact_sheet_theme_paint_preview (GthContactSheetTheme *theme,
int width,
int height)
{
- double font_scale;
+ double font_scale;
cairo_rectangle_int_t image_rect;
if (height < 200)
diff --git a/extensions/contact_sheet/gth-contact-sheet-theme.h b/extensions/contact_sheet/gth-contact-sheet-theme.h
index 076c3ca..4af7d7e 100644
--- a/extensions/contact_sheet/gth-contact-sheet-theme.h
+++ b/extensions/contact_sheet/gth-contact-sheet-theme.h
@@ -92,8 +92,8 @@ void gth_contact_sheet_theme_paint_background (GthContactShee
int height);
void gth_contact_sheet_theme_paint_frame (GthContactSheetTheme *theme,
cairo_t *cr,
- cairo_rectangle_int_t *frame_rect,
- cairo_rectangle_int_t *image_rect);
+ cairo_rectangle_int_t *frame_rect,
+ cairo_rectangle_int_t *image_rect);
void gth_contact_sheet_theme_paint_preview (GthContactSheetTheme *theme,
cairo_t *cr,
int width,
diff --git a/extensions/file_tools/cairo-rotate.c b/extensions/file_tools/cairo-rotate.c
index 373a8e9..ee2f0c5 100644
--- a/extensions/file_tools/cairo-rotate.c
+++ b/extensions/file_tools/cairo-rotate.c
@@ -85,11 +85,11 @@ _cairo_image_surface_rotate_get_cropping_parameters (cairo_surface_t *image,
void
-_cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image,
- double angle,
- double p1,
- double p2,
- cairo_rectangle_int_t *region)
+_cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image,
+ double angle,
+ double p1,
+ double p2,
+ cairo_rectangle_int_t *region)
{
double angle_rad;
double cos_angle, sin_angle;
diff --git a/extensions/file_tools/cairo-rotate.h b/extensions/file_tools/cairo-rotate.h
index 8ed6004..d958e24 100644
--- a/extensions/file_tools/cairo-rotate.h
+++ b/extensions/file_tools/cairo-rotate.h
@@ -28,22 +28,22 @@
G_BEGIN_DECLS
-void _cairo_image_surface_rotate_get_cropping_parameters (cairo_surface_t *image,
- double angle,
- double *p1_plus_p2,
- double *p_min);
-void _cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image,
- double angle,
- double p1,
- double p2,
- cairo_rectangle_int_t *region);
-double _cairo_image_surface_rotate_get_align_angle (gboolean vertical,
- GdkPoint *p1,
- GdkPoint *p2);
-cairo_surface_t * _cairo_image_surface_rotate (cairo_surface_t *image,
- double angle,
- gboolean high_quality,
- cairo_color_t *background_color);
+void _cairo_image_surface_rotate_get_cropping_parameters (cairo_surface_t *image,
+ double angle,
+ double *p1_plus_p2,
+ double *p_min);
+void _cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image,
+ double angle,
+ double p1,
+ double p2,
+ cairo_rectangle_int_t *region);
+double _cairo_image_surface_rotate_get_align_angle (gboolean vertical,
+ GdkPoint *p1,
+ GdkPoint *p2);
+cairo_surface_t * _cairo_image_surface_rotate (cairo_surface_t *image,
+ double angle,
+ gboolean high_quality,
+ cairo_color_t *background_color);
G_END_DECLS
diff --git a/extensions/file_tools/gth-file-tool-crop.c b/extensions/file_tools/gth-file-tool-crop.c
index 587d5a5..abc30e6 100644
--- a/extensions/file_tools/gth-file-tool-crop.c
+++ b/extensions/file_tools/gth-file-tool-crop.c
@@ -76,12 +76,12 @@ static void
crop_button_clicked_cb (GtkButton *button,
GthFileToolCrop *self)
{
- cairo_rectangle_int_t selection;
- GtkWidget *window;
- GtkWidget *viewer_page;
- GtkWidget *viewer;
- cairo_surface_t *old_image;
- cairo_surface_t *new_image;
+ cairo_rectangle_int_t selection;
+ GtkWidget *window;
+ GtkWidget *viewer_page;
+ GtkWidget *viewer;
+ cairo_surface_t *old_image;
+ cairo_surface_t *new_image;
gth_image_selector_get_selection (self->priv->selector, &selection);
if ((selection.width == 0) || (selection.height == 0))
@@ -157,7 +157,7 @@ selector_selection_changed_cb (GthImageSelector *selector,
GthFileToolCrop *self)
{
cairo_rectangle_int_t selection;
- int min, max;
+ int min, max;
gth_image_selector_get_selection (selector, &selection);
diff --git a/extensions/file_tools/gth-file-tool-rotate.c b/extensions/file_tools/gth-file-tool-rotate.c
index b1edd16..200939e 100644
--- a/extensions/file_tools/gth-file-tool-rotate.c
+++ b/extensions/file_tools/gth-file-tool-rotate.c
@@ -38,18 +38,18 @@ static gpointer parent_class = NULL;
struct _GthFileToolRotatePrivate {
- cairo_surface_t *image;
- gboolean has_alpha;
- GtkBuilder *builder;
- GtkWidget *crop_grid;
- GtkAdjustment *rotation_angle_adj;
- GtkAdjustment *crop_p1_adj;
- GtkAdjustment *crop_p2_adj;
- gboolean crop_enabled;
- double crop_p1_plus_p2;
- cairo_rectangle_int_t crop_region;
- GthImageViewerTool *alignment;
- GthImageViewerTool *rotator;
+ cairo_surface_t *image;
+ gboolean has_alpha;
+ GtkBuilder *builder;
+ GtkWidget *crop_grid;
+ GtkAdjustment *rotation_angle_adj;
+ GtkAdjustment *crop_p1_adj;
+ GtkAdjustment *crop_p2_adj;
+ gboolean crop_enabled;
+ double crop_p1_plus_p2;
+ cairo_rectangle_int_t crop_region;
+ GthImageViewerTool *alignment;
+ GthImageViewerTool *rotator;
};
diff --git a/extensions/file_tools/gth-image-line-tool.c b/extensions/file_tools/gth-image-line-tool.c
index 7a383b2..4c8e26a 100644
--- a/extensions/file_tools/gth-image-line-tool.c
+++ b/extensions/file_tools/gth-image-line-tool.c
@@ -41,26 +41,26 @@ static gpointer parent_class = NULL;
struct _GthImageLineToolPrivate {
- GthImageViewer *viewer;
+ GthImageViewer *viewer;
/* options */
- GdkPoint p1;
- GdkPoint p2;
+ GdkPoint p1;
+ GdkPoint p2;
/* utility variables */
- int original_width;
- int original_height;
- double preview_zoom;
- cairo_surface_t *preview_image;
- cairo_rectangle_int_t preview_image_area;
- GdkPoint preview_center;
- cairo_rectangle_int_t clip_area;
- cairo_matrix_t matrix;
- gboolean first_point_set;
- GthFit original_fit_mode;
- gboolean original_zoom_enabled;
+ int original_width;
+ int original_height;
+ double preview_zoom;
+ cairo_surface_t *preview_image;
+ cairo_rectangle_int_t preview_image_area;
+ GdkPoint preview_center;
+ cairo_rectangle_int_t clip_area;
+ cairo_matrix_t matrix;
+ gboolean first_point_set;
+ GthFit original_fit_mode;
+ gboolean original_zoom_enabled;
};
diff --git a/extensions/file_tools/gth-image-rotator.c b/extensions/file_tools/gth-image-rotator.c
index ed94e9f..bd349e5 100644
--- a/extensions/file_tools/gth-image-rotator.c
+++ b/extensions/file_tools/gth-image-rotator.c
@@ -47,34 +47,34 @@ static gpointer parent_class = NULL;
struct _GthImageRotatorPrivate {
- GthImageViewer *viewer;
+ GthImageViewer *viewer;
/* options */
- GdkPoint center;
- double angle;
- cairo_color_t background_color;
- gboolean enable_crop;
- cairo_rectangle_int_t crop_region;
- GthGridType grid_type;
- GthTransformResize resize;
+ GdkPoint center;
+ double angle;
+ cairo_color_t background_color;
+ gboolean enable_crop;
+ cairo_rectangle_int_t crop_region;
+ GthGridType grid_type;
+ GthTransformResize resize;
/* utility variables */
- int original_width;
- int original_height;
- double preview_zoom;
- cairo_surface_t *preview_image;
- cairo_rectangle_int_t preview_image_area;
- GdkPoint preview_center;
- cairo_rectangle_int_t clip_area;
- cairo_matrix_t matrix;
- gboolean dragging;
- double angle_before_dragging;
- GdkPoint drag_p1;
- GdkPoint drag_p2;
- GthFit original_fit_mode;
- gboolean original_zoom_enabled;
+ int original_width;
+ int original_height;
+ double preview_zoom;
+ cairo_surface_t *preview_image;
+ cairo_rectangle_int_t preview_image_area;
+ GdkPoint preview_center;
+ cairo_rectangle_int_t clip_area;
+ cairo_matrix_t matrix;
+ gboolean dragging;
+ double angle_before_dragging;
+ GdkPoint drag_p1;
+ GdkPoint drag_p2;
+ GthFit original_fit_mode;
+ gboolean original_zoom_enabled;
};
@@ -137,10 +137,10 @@ _cairo_matrix_transform_point (cairo_matrix_t *matrix,
static void
-gth_transform_resize (cairo_matrix_t *matrix,
- GthTransformResize resize,
- cairo_rectangle_int_t *original,
- cairo_rectangle_int_t *boundary)
+gth_transform_resize (cairo_matrix_t *matrix,
+ GthTransformResize resize,
+ cairo_rectangle_int_t *original,
+ cairo_rectangle_int_t *boundary)
{
int x1, y1, x2, y2;
@@ -826,8 +826,8 @@ gth_image_rotator_get_resize (GthImageRotator *self)
void
-gth_image_rotator_set_crop_region (GthImageRotator *self,
- cairo_rectangle_int_t *region)
+gth_image_rotator_set_crop_region (GthImageRotator *self,
+ cairo_rectangle_int_t *region)
{
self->priv->enable_crop = (region != NULL);
if (region != NULL)
@@ -864,12 +864,12 @@ gth_image_rotator_get_background (GthImageRotator *self,
static cairo_surface_t *
gth_image_rotator_get_result_fast (GthImageRotator *self)
{
- double tx, ty;
- cairo_matrix_t matrix;
- cairo_rectangle_int_t image_area;
- cairo_rectangle_int_t clip_area;
- cairo_surface_t *output;
- cairo_t *cr;
+ double tx, ty;
+ cairo_matrix_t matrix;
+ cairo_rectangle_int_t image_area;
+ cairo_rectangle_int_t clip_area;
+ cairo_surface_t *output;
+ cairo_t *cr;
/* compute the transformation matrix and the clip area */
diff --git a/extensions/file_tools/gth-image-rotator.h b/extensions/file_tools/gth-image-rotator.h
index 89fd599..c73fb78 100644
--- a/extensions/file_tools/gth-image-rotator.h
+++ b/extensions/file_tools/gth-image-rotator.h
@@ -83,7 +83,7 @@ void gth_image_rotator_set_resize (GthImageRotator *
GthTransformResize resize);
GthTransformResize gth_image_rotator_get_resize (GthImageRotator *self);
void gth_image_rotator_set_crop_region (GthImageRotator *self,
- cairo_rectangle_int_t *region);
+ cairo_rectangle_int_t *region);
void gth_image_rotator_set_background (GthImageRotator *self,
cairo_color_t *color);
void gth_image_rotator_get_background (GthImageRotator *self,
diff --git a/gthumb/cairo-utils.c b/gthumb/cairo-utils.c
index 702fa72..3ca83b0 100644
--- a/gthumb/cairo-utils.c
+++ b/gthumb/cairo-utils.c
@@ -766,9 +766,9 @@ _cairo_draw_slide (cairo_t *cr,
void
-_cairo_paint_grid (cairo_t *cr,
+_cairo_paint_grid (cairo_t *cr,
cairo_rectangle_int_t *rectangle,
- GthGridType grid_type)
+ GthGridType grid_type)
{
double ux, uy;
diff --git a/gthumb/cairo-utils.h b/gthumb/cairo-utils.h
index 85a7964..35868ef 100644
--- a/gthumb/cairo-utils.h
+++ b/gthumb/cairo-utils.h
@@ -132,83 +132,83 @@ extern const unsigned char cairo_channel[4];
/* math */
-int _cairo_multiply_alpha (int color,
- int alpha);
+int _cairo_multiply_alpha (int color,
+ int alpha);
/* colors */
-void _gdk_color_to_cairo_color (GdkColor *g_color,
- cairo_color_t *c_color);
-void _gdk_color_to_cairo_color_255 (GdkColor *g_color,
- cairo_color_255_t *c_color);
+void _gdk_color_to_cairo_color (GdkColor *g_color,
+ cairo_color_t *c_color);
+void _gdk_color_to_cairo_color_255 (GdkColor *g_color,
+ cairo_color_255_t *c_color);
/* surface */
-void _cairo_clear_surface (cairo_surface_t **surface);
+void _cairo_clear_surface (cairo_surface_t **surface);
cairo_surface_metadata_t *
- _cairo_image_surface_get_metadata (cairo_surface_t *surface);
-gboolean _cairo_image_surface_get_has_alpha (cairo_surface_t *surface);
-cairo_surface_t * _cairo_image_surface_copy (cairo_surface_t *surface);
-cairo_surface_t * _cairo_image_surface_copy_subsurface (cairo_surface_t *surface,
- int src_x,
- int src_y,
- int width,
- int height);
-cairo_surface_t * _cairo_image_surface_create_from_pixbuf (GdkPixbuf *pixbuf);
-cairo_surface_t * _cairo_image_surface_create_compatible (cairo_surface_t *surface);
-cairo_surface_t * _cairo_image_surface_scale_to (cairo_surface_t *surface,
- int width,
- int height,
- cairo_filter_t filter);
-void _cairo_image_surface_transform_get_steps (cairo_format_t format,
- int width,
- int height,
- GthTransform transform,
- int *destination_width_p,
- int *destination_height_p,
- int *line_start_p,
- int *line_step_p,
- int *pixel_step_p);
-cairo_surface_t * _cairo_image_surface_transform (cairo_surface_t *surface,
- GthTransform transform);
+ _cairo_image_surface_get_metadata (cairo_surface_t *surface);
+gboolean _cairo_image_surface_get_has_alpha (cairo_surface_t *surface);
+cairo_surface_t * _cairo_image_surface_copy (cairo_surface_t *surface);
+cairo_surface_t * _cairo_image_surface_copy_subsurface (cairo_surface_t *surface,
+ int src_x,
+ int src_y,
+ int width,
+ int height);
+cairo_surface_t * _cairo_image_surface_create_from_pixbuf (GdkPixbuf *pixbuf);
+cairo_surface_t * _cairo_image_surface_create_compatible (cairo_surface_t *surface);
+cairo_surface_t * _cairo_image_surface_scale_to (cairo_surface_t *surface,
+ int width,
+ int height,
+ cairo_filter_t filter);
+void _cairo_image_surface_transform_get_steps (cairo_format_t format,
+ int width,
+ int height,
+ GthTransform transform,
+ int *destination_width_p,
+ int *destination_height_p,
+ int *line_start_p,
+ int *line_step_p,
+ int *pixel_step_p);
+cairo_surface_t * _cairo_image_surface_transform (cairo_surface_t *surface,
+ GthTransform transform);
/* paint / draw */
-void _cairo_paint_full_gradient (cairo_surface_t *surface,
- GdkColor *h_color1,
- GdkColor *h_color2,
- GdkColor *v_color1,
- GdkColor *v_color2);
-void _cairo_draw_rounded_box (cairo_t *cr,
- double x,
- double y,
- double w,
- double h,
- double r);
-void _cairo_draw_drop_shadow (cairo_t *cr,
- double x,
- double y,
- double w,
- double h,
- double r);
-void _cairo_draw_frame (cairo_t *cr,
- double x,
- double y,
- double w,
- double h,
- double r);
-void _cairo_draw_slide (cairo_t *cr,
- double frame_x,
- double frame_y,
- double frame_width,
- double frame_height,
- double image_width,
- double image_height,
- GdkColor *frame_color,
- gboolean draw_inner_border);
-void _cairo_paint_grid (cairo_t *cr,
- cairo_rectangle_int_t *rectangle,
- GthGridType grid_type);
+void _cairo_paint_full_gradient (cairo_surface_t *surface,
+ GdkColor *h_color1,
+ GdkColor *h_color2,
+ GdkColor *v_color1,
+ GdkColor *v_color2);
+void _cairo_draw_rounded_box (cairo_t *cr,
+ double x,
+ double y,
+ double w,
+ double h,
+ double r);
+void _cairo_draw_drop_shadow (cairo_t *cr,
+ double x,
+ double y,
+ double w,
+ double h,
+ double r);
+void _cairo_draw_frame (cairo_t *cr,
+ double x,
+ double y,
+ double w,
+ double h,
+ double r);
+void _cairo_draw_slide (cairo_t *cr,
+ double frame_x,
+ double frame_y,
+ double frame_width,
+ double frame_height,
+ double image_width,
+ double image_height,
+ GdkColor *frame_color,
+ gboolean draw_inner_border);
+void _cairo_paint_grid (cairo_t *cr,
+ cairo_rectangle_int_t *rectangle,
+ GthGridType grid_type);
#endif /* CAIRO_UTILS_H */
diff --git a/gthumb/gth-cell-renderer-thumbnail.c b/gthumb/gth-cell-renderer-thumbnail.c
index 8c01e83..d6c9bf8 100644
--- a/gthumb/gth-cell-renderer-thumbnail.c
+++ b/gthumb/gth-cell-renderer-thumbnail.c
@@ -157,13 +157,13 @@ gth_cell_renderer_thumbnail_set_property (GObject *object,
static void
-gth_cell_renderer_thumbnail_get_size (GtkCellRenderer *cell,
- GtkWidget *widget,
- cairo_rectangle_int_t *cell_area,
- int *x_offset,
- int *y_offset,
- int *width,
- int *height)
+gth_cell_renderer_thumbnail_get_size (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ cairo_rectangle_int_t *cell_area,
+ int *x_offset,
+ int *y_offset,
+ int *width,
+ int *height)
{
GthCellRendererThumbnail *self;
int image_width;
@@ -225,20 +225,20 @@ gth_cell_renderer_thumbnail_get_size (GtkCellRenderer *cell,
static void
-gth_cell_renderer_thumbnail_render (GtkCellRenderer *cell,
- GdkWindow *window,
- GtkWidget *widget,
- cairo_rectangle_int_t *background_area,
- cairo_rectangle_int_t *cell_area,
- cairo_rectangle_int_t *expose_area,
- GtkCellRendererState flags)
+gth_cell_renderer_thumbnail_render (GtkCellRenderer *cell,
+ GdkWindow *window,
+ GtkWidget *widget,
+ cairo_rectangle_int_t *background_area,
+ cairo_rectangle_int_t *cell_area,
+ cairo_rectangle_int_t *expose_area,
+ GtkCellRendererState flags)
{
GthCellRendererThumbnail *self;
GtkStyle *style;
GtkStateType state;
- cairo_rectangle_int_t thumb_rect;
- cairo_rectangle_int_t draw_rect;
- cairo_rectangle_int_t image_rect;
+ cairo_rectangle_int_t thumb_rect;
+ cairo_rectangle_int_t draw_rect;
+ cairo_rectangle_int_t image_rect;
cairo_t *cr;
GdkPixbuf *pixbuf;
int xpad;
diff --git a/gthumb/gth-image-navigator.c b/gthumb/gth-image-navigator.c
index f8d9cc3..117ab6a 100644
--- a/gthumb/gth-image-navigator.c
+++ b/gthumb/gth-image-navigator.c
@@ -96,16 +96,16 @@ gth_image_navigator_get_type (void)
typedef struct {
- GthImageViewer *viewer;
- int x_root, y_root;
- GtkWidget *popup_win;
- GtkWidget *preview;
- cairo_surface_t *image;
- int image_width, image_height;
- int window_max_width, window_max_height;
- int popup_x, popup_y, popup_width, popup_height;
- cairo_rectangle_int_t visible_area;
- double zoom_factor;
+ GthImageViewer *viewer;
+ int x_root, y_root;
+ GtkWidget *popup_win;
+ GtkWidget *preview;
+ cairo_surface_t *image;
+ int image_width, image_height;
+ int window_max_width, window_max_height;
+ int popup_x, popup_y, popup_width, popup_height;
+ cairo_rectangle_int_t visible_area;
+ double zoom_factor;
} NavigatorPopup;
diff --git a/gthumb/gth-image-selector.c b/gthumb/gth-image-selector.c
index e85d8db..000f3ce 100644
--- a/gthumb/gth-image-selector.c
+++ b/gthumb/gth-image-selector.c
@@ -36,10 +36,10 @@
typedef struct {
- int ref_count;
- int id;
+ int ref_count;
+ int id;
cairo_rectangle_int_t area;
- GdkCursor *cursor;
+ GdkCursor *cursor;
} EventArea;
@@ -190,41 +190,41 @@ static gpointer parent_class = NULL;
struct _GthImageSelectorPrivate {
- GthImageViewer *viewer;
- GthSelectorType type;
-
- cairo_surface_t *surface;
- cairo_rectangle_int_t surface_area;
-
- gboolean use_ratio;
- double ratio;
- gboolean mask_visible;
- GthGridType grid_type;
- gboolean active;
- gboolean bind_dimensions;
- int bind_factor;
-
- cairo_rectangle_int_t drag_start_selection_area;
- cairo_rectangle_int_t selection_area;
- cairo_rectangle_int_t selection;
-
- GdkCursor *default_cursor;
- GdkCursor *current_cursor;
- GList *event_list;
- EventArea *current_area;
-
- guint timer_id; /* Timeout ID for
- * autoscrolling */
- double x_value_diff; /* Change the adjustment value
- * by this
- * amount when autoscrolling */
- double y_value_diff;
+ GthImageViewer *viewer;
+ GthSelectorType type;
+
+ cairo_surface_t *surface;
+ cairo_rectangle_int_t surface_area;
+
+ gboolean use_ratio;
+ double ratio;
+ gboolean mask_visible;
+ GthGridType grid_type;
+ gboolean active;
+ gboolean bind_dimensions;
+ int bind_factor;
+
+ cairo_rectangle_int_t drag_start_selection_area;
+ cairo_rectangle_int_t selection_area;
+ cairo_rectangle_int_t selection;
+
+ GdkCursor *default_cursor;
+ GdkCursor *current_cursor;
+ GList *event_list;
+ EventArea *current_area;
+
+ guint timer_id; /* Timeout ID for
+ * autoscrolling */
+ double x_value_diff; /* Change the adjustment value
+ * by this
+ * amount when autoscrolling */
+ double y_value_diff;
};
static gboolean
-point_in_rectangle (int x,
- int y,
+point_in_rectangle (int x,
+ int y,
cairo_rectangle_int_t rect)
{
return ((x >= rect.x)
@@ -265,9 +265,9 @@ real_to_selector (GthImageSelector *self,
static void
-convert_to_selection_area (GthImageSelector *self,
- cairo_rectangle_int_t real_area,
- cairo_rectangle_int_t *selection_area)
+convert_to_selection_area (GthImageSelector *self,
+ cairo_rectangle_int_t real_area,
+ cairo_rectangle_int_t *selection_area)
{
selection_area->x = real_to_selector (self, real_area.x);
selection_area->y = real_to_selector (self, real_area.y);
@@ -307,7 +307,7 @@ get_event_area_from_position (GthImageSelector *self,
GList *scan;
for (scan = self->priv->event_list; scan; scan = scan->next) {
- EventArea *event_area = scan->data;
+ EventArea *event_area = scan->data;
cairo_rectangle_int_t widget_area;
widget_area = event_area->area;
@@ -424,8 +424,8 @@ update_event_areas (GthImageSelector *self)
static void
-queue_draw (GthImageSelector *self,
- cairo_rectangle_int_t area)
+queue_draw (GthImageSelector *self,
+ cairo_rectangle_int_t area)
{
if (! gtk_widget_get_realized (GTK_WIDGET (self->priv->viewer)))
return;
@@ -447,9 +447,9 @@ selection_changed (GthImageSelector *self)
static void
-set_selection_area (GthImageSelector *self,
- cairo_rectangle_int_t new_selection,
- gboolean force_update)
+set_selection_area (GthImageSelector *self,
+ cairo_rectangle_int_t new_selection,
+ gboolean force_update)
{
cairo_rectangle_int_t old_selection_area;
cairo_rectangle_int_t dirty_region;
@@ -467,9 +467,9 @@ set_selection_area (GthImageSelector *self,
static void
-set_selection (GthImageSelector *self,
- cairo_rectangle_int_t new_selection,
- gboolean force_update)
+set_selection (GthImageSelector *self,
+ cairo_rectangle_int_t new_selection,
+ gboolean force_update)
{
cairo_rectangle_int_t new_area;
@@ -614,8 +614,8 @@ paint_background (GthImageSelector *self,
/* make the background darker */
{
cairo_rectangle_int_t *rects;
- int n_rects;
- int i;
+ int n_rects;
+ int i;
gdk_cairo_rectangle (cr, &self->priv->viewer->image_area);
cairo_clip (cr);
@@ -732,9 +732,9 @@ selector_to_real (GthImageSelector *self,
static void
-convert_to_real_selection (GthImageSelector *self,
- cairo_rectangle_int_t selection_area,
- cairo_rectangle_int_t *real_area)
+convert_to_real_selection (GthImageSelector *self,
+ cairo_rectangle_int_t selection_area,
+ cairo_rectangle_int_t *real_area)
{
real_area->x = selector_to_real (self, selection_area.x);
real_area->y = selector_to_real (self, selection_area.y);
@@ -796,8 +796,8 @@ gth_image_selector_button_release (GthImageViewerTool *base,
static void
grow_upward (cairo_rectangle_int_t *bound,
cairo_rectangle_int_t *r,
- int dy,
- gboolean check)
+ int dy,
+ gboolean check)
{
if (check && (r->y + dy < 0))
dy = -r->y;
@@ -809,8 +809,8 @@ grow_upward (cairo_rectangle_int_t *bound,
static void
grow_downward (cairo_rectangle_int_t *bound,
cairo_rectangle_int_t *r,
- int dy,
- gboolean check)
+ int dy,
+ gboolean check)
{
if (check && (r->y + r->height + dy > bound->height))
dy = bound->height - (r->y + r->height);
@@ -821,8 +821,8 @@ grow_downward (cairo_rectangle_int_t *bound,
static void
grow_leftward (cairo_rectangle_int_t *bound,
cairo_rectangle_int_t *r,
- int dx,
- gboolean check)
+ int dx,
+ gboolean check)
{
if (check && (r->x + dx < 0))
dx = -r->x;
@@ -834,8 +834,8 @@ grow_leftward (cairo_rectangle_int_t *bound,
static void
grow_rightward (cairo_rectangle_int_t *bound,
cairo_rectangle_int_t *r,
- int dx,
- gboolean check)
+ int dx,
+ gboolean check)
{
if (check && (r->x + r->width + dx > bound->width))
dx = bound->width - (r->x + r->width);
@@ -879,8 +879,8 @@ bind_dimension (int dimension,
static gboolean
-check_and_set_new_selection (GthImageSelector *self,
- cairo_rectangle_int_t new_selection)
+check_and_set_new_selection (GthImageSelector *self,
+ cairo_rectangle_int_t new_selection)
{
new_selection.width = MAX (0, new_selection.width);
new_selection.height = MAX (0, new_selection.height);
@@ -977,12 +977,12 @@ gth_image_selector_button_press (GthImageViewerTool *base,
static void
update_mouse_selection (GthImageSelector *self)
{
- gboolean check = ! self->priv->use_ratio;
- int dx, dy;
- cairo_rectangle_int_t new_selection, tmp;
- int semiplane;
- GthEventAreaType area_type = self->priv->current_area->id;
- EventArea *event_area;
+ gboolean check = ! self->priv->use_ratio;
+ int dx, dy;
+ cairo_rectangle_int_t new_selection, tmp;
+ int semiplane;
+ GthEventAreaType area_type = self->priv->current_area->id;
+ EventArea *event_area;
dx = selector_to_real (self, self->priv->viewer->drag_x - self->priv->viewer->drag_x_start);
dy = selector_to_real (self, self->priv->viewer->drag_y - self->priv->viewer->drag_y_start);
@@ -1491,8 +1491,8 @@ gth_image_selector_image_changed (GthImageViewerTool *base)
static void
gth_image_selector_zoom_changed (GthImageViewerTool *base)
{
- GthImageSelector *self = GTH_IMAGE_SELECTOR (base);
- cairo_rectangle_int_t selection;
+ GthImageSelector *self = GTH_IMAGE_SELECTOR (base);
+ cairo_rectangle_int_t selection;
gth_image_selector_get_selection (self, &selection);
set_selection (self, selection, TRUE);
@@ -1719,16 +1719,16 @@ gth_image_selector_set_selection_height (GthImageSelector *self,
void
-gth_image_selector_set_selection (GthImageSelector *self,
- cairo_rectangle_int_t selection)
+gth_image_selector_set_selection (GthImageSelector *self,
+ cairo_rectangle_int_t selection)
{
set_selection (self, selection, FALSE);
}
void
-gth_image_selector_get_selection (GthImageSelector *self,
- cairo_rectangle_int_t *selection)
+gth_image_selector_get_selection (GthImageSelector *self,
+ cairo_rectangle_int_t *selection)
{
selection->x = MAX (self->priv->selection.x, 0);
selection->y = MAX (self->priv->selection.y, 0);
diff --git a/gthumb/gth-image-selector.h b/gthumb/gth-image-selector.h
index f7072e7..23ab1b3 100644
--- a/gthumb/gth-image-selector.h
+++ b/gthumb/gth-image-selector.h
@@ -68,38 +68,38 @@ struct _GthImageSelectorClass
};
GType gth_image_selector_get_type (void);
-GthImageViewerTool * gth_image_selector_new (GthSelectorType type);
-gboolean gth_image_selector_set_selection_x (GthImageSelector *selector,
- int x);
-gboolean gth_image_selector_set_selection_y (GthImageSelector *selector,
- int y);
-gboolean gth_image_selector_set_selection_pos (GthImageSelector *selector,
- int x,
- int y);
-gboolean gth_image_selector_set_selection_width (GthImageSelector *selector,
- int width);
-gboolean gth_image_selector_set_selection_height (GthImageSelector *selector,
- int height);
-void gth_image_selector_set_selection (GthImageSelector *selector,
- cairo_rectangle_int_t selection);
-void gth_image_selector_get_selection (GthImageSelector *selector,
- cairo_rectangle_int_t *selection);
-void gth_image_selector_set_ratio (GthImageSelector *selector,
- gboolean use_ratio,
- double ratio,
- gboolean swap_x_and_y_to_start);
-double gth_image_selector_get_ratio (GthImageSelector *selector);
-gboolean gth_image_selector_get_use_ratio (GthImageSelector *selector);
-void gth_image_selector_set_mask_visible (GthImageSelector *selector,
- gboolean visible);
-gboolean gth_image_selector_get_mask_visible (GthImageSelector *selector);
-void gth_image_selector_set_grid_type (GthImageSelector *selector,
- GthGridType grid_type);
-GthGridType gth_image_selector_get_grid_type (GthImageSelector *selector);
-void gth_image_selector_bind_dimensions (GthImageSelector *selector,
- gboolean bind,
- int factor);
-void gth_image_selector_center (GthImageSelector *selector);
+GthImageViewerTool * gth_image_selector_new (GthSelectorType type);
+gboolean gth_image_selector_set_selection_x (GthImageSelector *selector,
+ int x);
+gboolean gth_image_selector_set_selection_y (GthImageSelector *selector,
+ int y);
+gboolean gth_image_selector_set_selection_pos (GthImageSelector *selector,
+ int x,
+ int y);
+gboolean gth_image_selector_set_selection_width (GthImageSelector *selector,
+ int width);
+gboolean gth_image_selector_set_selection_height (GthImageSelector *selector,
+ int height);
+void gth_image_selector_set_selection (GthImageSelector *selector,
+ cairo_rectangle_int_t selection);
+void gth_image_selector_get_selection (GthImageSelector *selector,
+ cairo_rectangle_int_t *selection);
+void gth_image_selector_set_ratio (GthImageSelector *selector,
+ gboolean use_ratio,
+ double ratio,
+ gboolean swap_x_and_y_to_start);
+double gth_image_selector_get_ratio (GthImageSelector *selector);
+gboolean gth_image_selector_get_use_ratio (GthImageSelector *selector);
+void gth_image_selector_set_mask_visible (GthImageSelector *selector,
+ gboolean visible);
+gboolean gth_image_selector_get_mask_visible (GthImageSelector *selector);
+void gth_image_selector_set_grid_type (GthImageSelector *selector,
+ GthGridType grid_type);
+GthGridType gth_image_selector_get_grid_type (GthImageSelector *selector);
+void gth_image_selector_bind_dimensions (GthImageSelector *selector,
+ gboolean bind,
+ int factor);
+void gth_image_selector_center (GthImageSelector *selector);
G_END_DECLS
diff --git a/gthumb/gth-image-viewer.c b/gthumb/gth-image-viewer.c
index 74bf852..39fcaae 100644
--- a/gthumb/gth-image-viewer.c
+++ b/gthumb/gth-image-viewer.c
@@ -864,7 +864,7 @@ scroll_to (GthImageViewer *self,
self->y_offset = *y_offset;
if (self->priv->painters != NULL) {
- cairo_rectangle_int_t area;
+ cairo_rectangle_int_t area;
area.x = 0;
area.y = 0;
@@ -880,7 +880,7 @@ scroll_to (GthImageViewer *self,
{
cairo_rectangle_int_t area;
- GdkRegion *region;
+ GdkRegion *region;
area.x = (delta_x < 0) ? self->priv->frame_border : self->priv->frame_border + delta_x;
area.y = (delta_y < 0) ? self->priv->frame_border : self->priv->frame_border + delta_y;
@@ -895,7 +895,7 @@ scroll_to (GthImageViewer *self,
/* invalidate the exposed areas */
{
- GdkRegion *region;
+ GdkRegion *region;
cairo_rectangle_int_t area;
region = gdk_region_new ();
@@ -2524,18 +2524,18 @@ gth_image_viewer_paint (GthImageViewer *self,
void
-gth_image_viewer_paint_region (GthImageViewer *self,
- cairo_t *cr,
- cairo_surface_t *surface,
- int src_x,
- int src_y,
- cairo_rectangle_int_t *pixbuf_area,
- GdkRegion *region,
- cairo_filter_t filter)
+gth_image_viewer_paint_region (GthImageViewer *self,
+ cairo_t *cr,
+ cairo_surface_t *surface,
+ int src_x,
+ int src_y,
+ cairo_rectangle_int_t *pixbuf_area,
+ GdkRegion *region,
+ cairo_filter_t filter)
{
cairo_rectangle_int_t *rects;
- int n_rects;
- int i;
+ int n_rects;
+ int i;
cairo_save (cr);
@@ -2734,8 +2734,8 @@ gth_image_viewer_apply_painters (GthImageViewer *self,
void
-gth_image_viewer_crop_area (GthImageViewer *self,
- cairo_rectangle_int_t *area)
+gth_image_viewer_crop_area (GthImageViewer *self,
+ cairo_rectangle_int_t *area)
{
GtkWidget *widget = GTK_WIDGET (self);
GtkAllocation allocation;
diff --git a/gthumb/gth-image-viewer.h b/gthumb/gth-image-viewer.h
index ef951bd..5dd22f1 100644
--- a/gthumb/gth-image-viewer.h
+++ b/gthumb/gth-image-viewer.h
@@ -105,23 +105,23 @@ struct _GthImageViewer
/*< protected, used by the tools >*/
- cairo_rectangle_int_t image_area;
- int x_offset; /* Scroll offsets. */
- int y_offset;
- gboolean pressed;
- int event_x_start;
- int event_y_start;
- int event_x_prev;
- int event_y_prev;
- gboolean dragging;
- int drag_x_start;
- int drag_y_start;
- int drag_x_prev;
- int drag_y_prev;
- int drag_x;
- int drag_y;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
+ cairo_rectangle_int_t image_area;
+ int x_offset; /* Scroll offsets. */
+ int y_offset;
+ gboolean pressed;
+ int event_x_start;
+ int event_y_start;
+ int event_x_prev;
+ int event_y_prev;
+ gboolean dragging;
+ int drag_x_start;
+ int drag_y_start;
+ int drag_x_prev;
+ int drag_y_prev;
+ int drag_x;
+ int drag_y;
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
};
@@ -157,169 +157,169 @@ GtkWidget* gth_image_viewer_new (void);
/* viewer content. */
-void gth_image_viewer_set_animation (GthImageViewer *viewer,
- GdkPixbufAnimation *animation,
- int original_width,
- int original_height);
-void gth_image_viewer_set_pixbuf (GthImageViewer *viewer,
- GdkPixbuf *pixbuf,
- int original_width,
- int original_height);
-void gth_image_viewer_set_surface (GthImageViewer *viewer,
- cairo_surface_t *surface,
- int original_width,
- int original_height);
-void gth_image_viewer_set_image (GthImageViewer *viewer,
- GthImage *image,
- int original_width,
- int original_height);
-void gth_image_viewer_set_better_quality (GthImageViewer *viewer,
- GthImage *image,
- int original_width,
- int original_height);
-void gth_image_viewer_set_void (GthImageViewer *viewer);
-gboolean gth_image_viewer_is_void (GthImageViewer *viewer);
-void gth_image_viewer_update_view (GthImageViewer *viewer);
-void gth_image_viewer_add_painter (GthImageViewer *viewer,
+void gth_image_viewer_set_animation (GthImageViewer *viewer,
+ GdkPixbufAnimation *animation,
+ int original_width,
+ int original_height);
+void gth_image_viewer_set_pixbuf (GthImageViewer *viewer,
+ GdkPixbuf *pixbuf,
+ int original_width,
+ int original_height);
+void gth_image_viewer_set_surface (GthImageViewer *viewer,
+ cairo_surface_t *surface,
+ int original_width,
+ int original_height);
+void gth_image_viewer_set_image (GthImageViewer *viewer,
+ GthImage *image,
+ int original_width,
+ int original_height);
+void gth_image_viewer_set_better_quality (GthImageViewer *viewer,
+ GthImage *image,
+ int original_width,
+ int original_height);
+void gth_image_viewer_set_void (GthImageViewer *viewer);
+gboolean gth_image_viewer_is_void (GthImageViewer *viewer);
+void gth_image_viewer_update_view (GthImageViewer *viewer);
+void gth_image_viewer_add_painter (GthImageViewer *viewer,
GthImageViewerPaintFunc
- func,
- gpointer user_data);
-void gth_image_viewer_remove_painter (GthImageViewer *viewer,
+ func,
+ gpointer user_data);
+void gth_image_viewer_remove_painter (GthImageViewer *viewer,
GthImageViewerPaintFunc
- func,
- gpointer user_data);
+ func,
+ gpointer user_data);
/* image info. */
-int gth_image_viewer_get_image_width (GthImageViewer *viewer);
-int gth_image_viewer_get_image_height (GthImageViewer *viewer);
-gboolean gth_image_viewer_get_has_alpha (GthImageViewer *viewer);
-GdkPixbuf * gth_image_viewer_get_current_pixbuf (GthImageViewer *viewer);
+int gth_image_viewer_get_image_width (GthImageViewer *viewer);
+int gth_image_viewer_get_image_height (GthImageViewer *viewer);
+gboolean gth_image_viewer_get_has_alpha (GthImageViewer *viewer);
+GdkPixbuf * gth_image_viewer_get_current_pixbuf (GthImageViewer *viewer);
cairo_surface_t *
- gth_image_viewer_get_current_image (GthImageViewer *viewer);
-void gth_image_viewer_get_original_size (GthImageViewer *viewer,
- int *width,
- int *height);
+ gth_image_viewer_get_current_image (GthImageViewer *viewer);
+void gth_image_viewer_get_original_size (GthImageViewer *viewer,
+ int *width,
+ int *height);
/* animation. */
-void gth_image_viewer_start_animation (GthImageViewer *viewer);
-void gth_image_viewer_stop_animation (GthImageViewer *viewer);
-void gth_image_viewer_step_animation (GthImageViewer *viewer);
-gboolean gth_image_viewer_is_animation (GthImageViewer *viewer);
-gboolean gth_image_viewer_is_playing_animation (GthImageViewer *viewer);
+void gth_image_viewer_start_animation (GthImageViewer *viewer);
+void gth_image_viewer_stop_animation (GthImageViewer *viewer);
+void gth_image_viewer_step_animation (GthImageViewer *viewer);
+gboolean gth_image_viewer_is_animation (GthImageViewer *viewer);
+gboolean gth_image_viewer_is_playing_animation (GthImageViewer *viewer);
/* zoom. */
-void gth_image_viewer_set_zoom (GthImageViewer *viewer,
- gdouble zoom);
-gdouble gth_image_viewer_get_zoom (GthImageViewer *viewer);
-void gth_image_viewer_set_zoom_quality (GthImageViewer *viewer,
- GthZoomQuality quality);
-GthZoomQuality gth_image_viewer_get_zoom_quality (GthImageViewer *viewer);
-cairo_filter_t gth_image_viewer_get_zoom_quality_filter (GthImageViewer *viewer);
-void gth_image_viewer_set_zoom_change (GthImageViewer *viewer,
- GthZoomChange zoom_change);
-GthZoomChange gth_image_viewer_get_zoom_change (GthImageViewer *viewer);
-void gth_image_viewer_zoom_in (GthImageViewer *viewer);
-void gth_image_viewer_zoom_out (GthImageViewer *viewer);
-void gth_image_viewer_set_fit_mode (GthImageViewer *viewer,
- GthFit fit_mode);
-GthFit gth_image_viewer_get_fit_mode (GthImageViewer *viewer);
-void gth_image_viewer_set_zoom_enabled (GthImageViewer *viewer,
- gboolean value);
-gboolean gth_image_viewer_get_zoom_enabled (GthImageViewer *viewer);
-void gth_image_viewer_enable_zoom_with_keys (GthImageViewer *viewer,
- gboolean value);
+void gth_image_viewer_set_zoom (GthImageViewer *viewer,
+ gdouble zoom);
+gdouble gth_image_viewer_get_zoom (GthImageViewer *viewer);
+void gth_image_viewer_set_zoom_quality (GthImageViewer *viewer,
+ GthZoomQuality quality);
+GthZoomQuality gth_image_viewer_get_zoom_quality (GthImageViewer *viewer);
+cairo_filter_t gth_image_viewer_get_zoom_quality_filter (GthImageViewer *viewer);
+void gth_image_viewer_set_zoom_change (GthImageViewer *viewer,
+ GthZoomChange zoom_change);
+GthZoomChange gth_image_viewer_get_zoom_change (GthImageViewer *viewer);
+void gth_image_viewer_zoom_in (GthImageViewer *viewer);
+void gth_image_viewer_zoom_out (GthImageViewer *viewer);
+void gth_image_viewer_set_fit_mode (GthImageViewer *viewer,
+ GthFit fit_mode);
+GthFit gth_image_viewer_get_fit_mode (GthImageViewer *viewer);
+void gth_image_viewer_set_zoom_enabled (GthImageViewer *viewer,
+ gboolean value);
+gboolean gth_image_viewer_get_zoom_enabled (GthImageViewer *viewer);
+void gth_image_viewer_enable_zoom_with_keys (GthImageViewer *viewer,
+ gboolean value);
/* visualization options. */
-void gth_image_viewer_set_transp_type (GthImageViewer *viewer,
- GthTranspType transp_type);
-GthTranspType gth_image_viewer_get_transp_type (GthImageViewer *viewer);
-void gth_image_viewer_set_check_type (GthImageViewer *viewer,
- GthCheckType check_type);
-GthCheckType gth_image_viewer_get_check_type (GthImageViewer *viewer);
-void gth_image_viewer_set_check_size (GthImageViewer *view,
- GthCheckSize check_size);
-GthCheckSize gth_image_viewer_get_check_size (GthImageViewer *viewer);
+void gth_image_viewer_set_transp_type (GthImageViewer *viewer,
+ GthTranspType transp_type);
+GthTranspType gth_image_viewer_get_transp_type (GthImageViewer *viewer);
+void gth_image_viewer_set_check_type (GthImageViewer *viewer,
+ GthCheckType check_type);
+GthCheckType gth_image_viewer_get_check_type (GthImageViewer *viewer);
+void gth_image_viewer_set_check_size (GthImageViewer *view,
+ GthCheckSize check_size);
+GthCheckSize gth_image_viewer_get_check_size (GthImageViewer *viewer);
/* misc. */
-void gth_image_viewer_clicked (GthImageViewer *viewer);
-void gth_image_viewer_set_size_request (GthImageViewer *viewer,
- int width,
- int height);
-void gth_image_viewer_set_black_background (GthImageViewer *viewer,
- gboolean set_black);
-gboolean gth_image_viewer_is_black_background (GthImageViewer *viewer);
-void gth_image_viewer_get_adjustments (GthImageViewer *self,
- GtkAdjustment **hadj,
- GtkAdjustment **vadj);
-void gth_image_viewer_set_tool (GthImageViewer *viewer,
- GthImageViewerTool *tool);
+void gth_image_viewer_clicked (GthImageViewer *viewer);
+void gth_image_viewer_set_size_request (GthImageViewer *viewer,
+ int width,
+ int height);
+void gth_image_viewer_set_black_background (GthImageViewer *viewer,
+ gboolean set_black);
+gboolean gth_image_viewer_is_black_background (GthImageViewer *viewer);
+void gth_image_viewer_get_adjustments (GthImageViewer *self,
+ GtkAdjustment **hadj,
+ GtkAdjustment **vadj);
+void gth_image_viewer_set_tool (GthImageViewer *viewer,
+ GthImageViewerTool *tool);
/* Scrolling. */
-void gth_image_viewer_scroll_to (GthImageViewer *viewer,
- int x_offset,
- int y_offset);
-void gth_image_viewer_scroll_step_x (GthImageViewer *viewer,
- gboolean increment);
-void gth_image_viewer_scroll_step_y (GthImageViewer *viewer,
- gboolean increment);
-void gth_image_viewer_scroll_page_x (GthImageViewer *viewer,
- gboolean increment);
-void gth_image_viewer_scroll_page_y (GthImageViewer *viewer,
- gboolean increment);
-void gth_image_viewer_get_scroll_offset (GthImageViewer *viewer,
- int *x,
- int *y);
-void gth_image_viewer_set_reset_scrollbars (GthImageViewer *viewer,
- gboolean reset);
-gboolean gth_image_viewer_get_reset_scrollbars (GthImageViewer *viewer);
+void gth_image_viewer_scroll_to (GthImageViewer *viewer,
+ int x_offset,
+ int y_offset);
+void gth_image_viewer_scroll_step_x (GthImageViewer *viewer,
+ gboolean increment);
+void gth_image_viewer_scroll_step_y (GthImageViewer *viewer,
+ gboolean increment);
+void gth_image_viewer_scroll_page_x (GthImageViewer *viewer,
+ gboolean increment);
+void gth_image_viewer_scroll_page_y (GthImageViewer *viewer,
+ gboolean increment);
+void gth_image_viewer_get_scroll_offset (GthImageViewer *viewer,
+ int *x,
+ int *y);
+void gth_image_viewer_set_reset_scrollbars (GthImageViewer *viewer,
+ gboolean reset);
+gboolean gth_image_viewer_get_reset_scrollbars (GthImageViewer *viewer);
/* Cursor. */
-void gth_image_viewer_show_cursor (GthImageViewer *viewer);
-void gth_image_viewer_hide_cursor (GthImageViewer *viewer);
-void gth_image_viewer_set_cursor (GthImageViewer *viewer,
- GdkCursor *cursor);
-gboolean gth_image_viewer_is_cursor_visible (GthImageViewer *viewer);
+void gth_image_viewer_show_cursor (GthImageViewer *viewer);
+void gth_image_viewer_hide_cursor (GthImageViewer *viewer);
+void gth_image_viewer_set_cursor (GthImageViewer *viewer,
+ GdkCursor *cursor);
+gboolean gth_image_viewer_is_cursor_visible (GthImageViewer *viewer);
/* Frame. */
-void gth_image_viewer_show_frame (GthImageViewer *viewer);
-void gth_image_viewer_hide_frame (GthImageViewer *viewer);
-gboolean gth_image_viewer_is_frame_visible (GthImageViewer *viewer);
+void gth_image_viewer_show_frame (GthImageViewer *viewer);
+void gth_image_viewer_hide_frame (GthImageViewer *viewer);
+gboolean gth_image_viewer_is_frame_visible (GthImageViewer *viewer);
/*< protected, used by the tools >*/
-void gth_image_viewer_paint (GthImageViewer *viewer,
- cairo_t *cr,
- cairo_surface_t *surface,
- int src_x,
- int src_y,
- int dest_x,
- int dest_y,
- int width,
- int height,
- cairo_filter_t filter);
-void gth_image_viewer_paint_region (GthImageViewer *viewer,
- cairo_t *cr,
- cairo_surface_t *surface,
- int src_x,
- int src_y,
- cairo_rectangle_int_t *pixbuf_area,
- GdkRegion *region,
- cairo_filter_t filter);
-void gth_image_viewer_paint_background (GthImageViewer *self,
- cairo_t *cr);
-void gth_image_viewer_apply_painters (GthImageViewer *image_viewer,
- GdkEventExpose *event,
- cairo_t *cr);
-void gth_image_viewer_crop_area (GthImageViewer *viewer,
- cairo_rectangle_int_t *area);
+void gth_image_viewer_paint (GthImageViewer *viewer,
+ cairo_t *cr,
+ cairo_surface_t *surface,
+ int src_x,
+ int src_y,
+ int dest_x,
+ int dest_y,
+ int width,
+ int height,
+ cairo_filter_t filter);
+void gth_image_viewer_paint_region (GthImageViewer *viewer,
+ cairo_t *cr,
+ cairo_surface_t *surface,
+ int src_x,
+ int src_y,
+ cairo_rectangle_int_t *pixbuf_area,
+ GdkRegion *region,
+ cairo_filter_t filter);
+void gth_image_viewer_paint_background (GthImageViewer *self,
+ cairo_t *cr);
+void gth_image_viewer_apply_painters (GthImageViewer *image_viewer,
+ GdkEventExpose *event,
+ cairo_t *cr);
+void gth_image_viewer_crop_area (GthImageViewer *viewer,
+ cairo_rectangle_int_t *area);
G_END_DECLS
diff --git a/gthumb/gth-menu-button.c b/gthumb/gth-menu-button.c
index 44490dd..08d5d56 100644
--- a/gthumb/gth-menu-button.c
+++ b/gthumb/gth-menu-button.c
@@ -143,13 +143,13 @@ menu_position_func (GtkMenu *menu,
gboolean *push_in,
GthMenuButton *self)
{
- GtkWidget *widget = GTK_WIDGET (self);
- GtkRequisition menu_req;
- GtkTextDirection direction;
- cairo_rectangle_int_t monitor;
- int monitor_num;
- GdkScreen *screen;
- GtkAllocation allocation;
+ GtkWidget *widget = GTK_WIDGET (self);
+ GtkRequisition menu_req;
+ GtkTextDirection direction;
+ cairo_rectangle_int_t monitor;
+ int monitor_num;
+ GdkScreen *screen;
+ GtkAllocation allocation;
gtk_widget_size_request (GTK_WIDGET (self->priv->menu), &menu_req);
diff --git a/gthumb/gth-time-selector.c b/gthumb/gth-time-selector.c
index 850c8f1..6cf4174 100644
--- a/gthumb/gth-time-selector.c
+++ b/gthumb/gth-time-selector.c
@@ -117,14 +117,14 @@ hide_calendar_popup (GthTimeSelector *self)
static void
show_calendar_popup (GthTimeSelector *self)
{
- GtkRequisition popup_req;
- int x;
- int y;
- GtkAllocation allocation;
- int selector_height;
- GdkScreen *screen;
- gint monitor_num;
- cairo_rectangle_int_t monitor;
+ GtkRequisition popup_req;
+ int x;
+ int y;
+ GtkAllocation allocation;
+ int selector_height;
+ GdkScreen *screen;
+ gint monitor_num;
+ cairo_rectangle_int_t monitor;
gtk_widget_size_request (self->priv->popup_box, &popup_req);
@@ -338,8 +338,8 @@ calendar_popup_button_press_event_cb (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- GthTimeSelector *self = user_data;
- cairo_rectangle_int_t popup_area;
+ GthTimeSelector *self = user_data;
+ cairo_rectangle_int_t popup_area;
gdk_window_get_geometry (gtk_widget_get_window (self->priv->calendar_popup),
&popup_area.x,
diff --git a/gthumb/gth-toggle-menu-tool-button.c b/gthumb/gth-toggle-menu-tool-button.c
index 7bbde1a..b14d1f4 100644
--- a/gthumb/gth-toggle-menu-tool-button.c
+++ b/gthumb/gth-toggle-menu-tool-button.c
@@ -455,15 +455,15 @@ menu_position_func (GtkMenu *menu,
gboolean *push_in,
GthToggleMenuToolButton *button)
{
- GtkWidget *widget = GTK_WIDGET (button);
- GtkRequisition req;
- GtkRequisition menu_req;
- GtkOrientation orientation;
- GtkTextDirection direction;
- cairo_rectangle_int_t monitor;
- int monitor_num;
- GdkScreen *screen;
- GtkAllocation allocation;
+ GtkWidget *widget = GTK_WIDGET (button);
+ GtkRequisition req;
+ GtkRequisition menu_req;
+ GtkOrientation orientation;
+ GtkTextDirection direction;
+ cairo_rectangle_int_t monitor;
+ int monitor_num;
+ GdkScreen *screen;
+ GtkAllocation allocation;
gtk_widget_size_request (GTK_WIDGET (button->priv->menu), &menu_req);
diff --git a/gthumb/gtk-utils.c b/gthumb/gtk-utils.c
index 57d64e7..69f319a 100644
--- a/gthumb/gtk-utils.c
+++ b/gthumb/gtk-utils.c
@@ -900,7 +900,7 @@ _gtk_widget_get_screen_size (GtkWidget *widget,
int *width,
int *height)
{
- GdkScreen *screen;
+ GdkScreen *screen;
cairo_rectangle_int_t geometry;
screen = gtk_widget_get_screen (widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
