Remove white frame from images.

- Remove frames on thumbnails view, with an exception when dragging
  multiple images at once (as it helps to represent that more than
  one image is grabbed). Keep the drop shadow but reduce it.
- Remove image frame and shadow in edit view.

Fixes #181.

Author: mtwebster

extensions/slideshow/gth-slideshow.c

@@ -758,7 +758,6 @@ default_projector_construct (GthSlideshow *self)
 	self->priv->paint_paused = FALSE;
 
 	self->priv->viewer = gth_image_viewer_new ();
-	gth_image_viewer_hide_frame (GTH_IMAGE_VIEWER (self->priv->viewer));
 	gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (self->priv->viewer), GTH_FIT_SIZE);
 	gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (self->priv->viewer), GTH_ZOOM_CHANGE_FIT_SIZE);
 

pix/cairo-utils.c

@@ -1273,10 +1273,10 @@ _cairo_draw_thumbnail_frame (cairo_t *cr,
 
 	cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.33);
 	_cairo_draw_rounded_box (cr,
-				 x + 2,
-				 y + 2,
-				 width - 1,
-				 height - 1,
+				 x + 1,
+				 y + 1,
+				 width,
+				 height,
 				 0);
 	cairo_fill (cr);
 
@@ -1498,9 +1498,10 @@ _cairo_create_dnd_icon (cairo_surface_t *image,
 		break;
 
 	case ITEM_STYLE_IMAGE:
-		if (multi_dnd)
+		if (multi_dnd) {
 			_cairo_draw_thumbnail_frame (cr, frame_rect.x + DRAG_ICON_THUMBNAIL_OFFSET, frame_rect.y + DRAG_ICON_THUMBNAIL_OFFSET, frame_rect.width, frame_rect.height);
-		_cairo_draw_thumbnail_frame (cr, frame_rect.x, frame_rect.y, frame_rect.width, frame_rect.height);
+            _cairo_draw_thumbnail_frame (cr, frame_rect.x, frame_rect.y, frame_rect.width, frame_rect.height);
+        }
 		break;
 
 	case ITEM_STYLE_VIDEO:

pix/gth-grid-view.c

@@ -47,7 +47,6 @@
 #define DEFAULT_CAPTION_PADDING    2
 #define DEFAULT_CELL_SPACING       16
 #define DEFAULT_CELL_PADDING       5
-#define DEFAULT_THUMBNAIL_BORDER   3
 #define SCROLL_DELAY               30
 #define LAYOUT_DELAY               20
 #define RUBBERBAND_BORDER          2
@@ -152,7 +151,6 @@ struct _GthGridViewPrivate {
 	int                    width;               /* size of the view */
 	int                    height;
 	int                    thumbnail_size;
-	int                    thumbnail_border;
 	int                    cell_size;           /* max size of any cell area */
 	int                    cell_spacing;        /* vertical space and mininum horizontal space between adjacent cell areas */
 	double                 cell_x_spacing;      /* horizontal space between adjacent cell areas (calculated automatically to fill the horizontal space uniformly). */
@@ -667,11 +665,11 @@ _gth_grid_view_update_item_size (GthGridView     *self,
 	switch (item->style) {
 	case ITEM_STYLE_VIDEO:
 		item->thumbnail_area.width = item->pixbuf_area.width;
-		item->thumbnail_area.height = thumbnail_size - (self->priv->thumbnail_border * 2);
+		item->thumbnail_area.height = thumbnail_size;
 		break;
 	case ITEM_STYLE_IMAGE:
-		item->thumbnail_area.width = item->pixbuf_area.width + (self->priv->thumbnail_border * 2);
-		item->thumbnail_area.height = item->pixbuf_area.height + (self->priv->thumbnail_border * 2);
+		item->thumbnail_area.width = item->pixbuf_area.width;
+		item->thumbnail_area.height = item->pixbuf_area.height;
 		break;
 	case ITEM_STYLE_ICON:
 		item->thumbnail_area.width = thumbnail_size;
@@ -1300,7 +1298,6 @@ _gth_grid_view_item_draw_thumbnail (GthGridViewItem *item,
 {
 	cairo_surface_t       *image;
 	GtkStyleContext       *style_context;
-	cairo_rectangle_int_t  frame_rect;
 
 	image = item->thumbnail;
 	if (image == NULL)
@@ -1319,8 +1316,6 @@ _gth_grid_view_item_draw_thumbnail (GthGridViewItem *item,
 	gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_CELL);
 #endif
 
-	frame_rect = item->pixbuf_area;
-
 	if ((item->style == ITEM_STYLE_ICON)
             || ! (item->is_image || (item_state & GTK_STATE_FLAG_SELECTED) || (item_state == GTK_STATE_FLAG_NORMAL)))
 	{
@@ -1365,8 +1360,6 @@ _gth_grid_view_item_draw_thumbnail (GthGridViewItem *item,
 	}
 
 	if (item->style == ITEM_STYLE_VIDEO) {
-		frame_rect = item->thumbnail_area;
-
 		_cairo_draw_film_background (cr,
 					     item->thumbnail_area.x,
 					     item->thumbnail_area.y,
@@ -1389,34 +1382,6 @@ _gth_grid_view_item_draw_thumbnail (GthGridViewItem *item,
 					     grid_view->priv->thumbnail_size);
 	}
 
-	if ((item_state & GTK_STATE_FLAG_SELECTED) || (item_state & GTK_STATE_FLAG_FOCUSED)) {
-#if GTK_CHECK_VERSION(3, 20, 0)
-		gtk_style_context_save (style_context);
-		gtk_style_context_add_class (style_context, "icon-effect");
-		gtk_render_background (style_context,
-				       cr,
-				       frame_rect.x,
-				       frame_rect.y,
-				       frame_rect.width,
-				       frame_rect.height);
-		gtk_style_context_restore (style_context);
-#else
-		GdkRGBA color;
-		gtk_style_context_get_background_color (style_context, item_state, &color);
-		cairo_set_source_rgba (cr, color.red, color.green, color.blue, 0.5);
-		cairo_rectangle (cr,
-				 frame_rect.x,
-				 frame_rect.y,
-				 frame_rect.width,
-				 frame_rect.height);
-		cairo_fill_preserve (cr);
-
-		cairo_set_line_width (cr, 2);
-		cairo_set_source_rgb (cr, color.red, color.green, color.blue);
-		cairo_stroke (cr);
-#endif
-	}
-
 	gtk_style_context_restore (style_context);
 	cairo_restore (cr);
 
@@ -3476,7 +3441,7 @@ _gth_grid_view_set_thumbnail_size (GthGridView *self,
 				   int          size)
 {
 	self->priv->thumbnail_size = size;
-	self->priv->cell_size = self->priv->thumbnail_size + (self->priv->thumbnail_border * 2) + (self->priv->cell_padding * 2);
+	self->priv->cell_size = self->priv->thumbnail_size + (self->priv->cell_padding * 2);
 	self->priv->update_caption_height = TRUE;
 	g_object_notify (G_OBJECT (self), "thumbnail-size");
 
@@ -3858,7 +3823,6 @@ gth_grid_view_init (GthGridView *self)
 	self->priv->width = 0;
 	self->priv->height = 0;
 	/* self->priv->thumbnail_size = 0; */
-	self->priv->thumbnail_border = DEFAULT_THUMBNAIL_BORDER;
 
 	/* self->priv->cell_size = 0; */
 	self->priv->cell_spacing = DEFAULT_CELL_SPACING;

pix/gth-image-dragger.c

@@ -31,7 +31,6 @@
 
 #define SIZE_TOO_BIG_FOR_SCALE_BILINEAR (3000 * 3000)
 #define MAX_ZOOM_LEVEL_FOR_HIGH_QUALITY 3.0
-#define FRAME_BORDER 15
 #define DRAG_ICON_SIZE 128
 
 
@@ -107,12 +106,6 @@ gth_image_dragger_set_property (GObject      *object,
 	switch (property_id) {
 	case PROP_SHOW_FRAME:
 		self->priv->show_frame = g_value_get_boolean (value);
-		if (self->priv->viewer != NULL) {
-			if (self->priv->show_frame)
-				gth_image_viewer_show_frame (self->priv->viewer, FRAME_BORDER);
-			else
-				gth_image_viewer_hide_frame (self->priv->viewer);
-		}
 		break;
 	default:
 		break;
@@ -191,8 +184,6 @@ gth_image_dragger_set_viewer (GthImageViewerTool *base,
 
 	self->priv->viewer = image_viewer;
 	g_object_add_weak_pointer (G_OBJECT (image_viewer), (gpointer *) &self->priv->viewer);
-	if (self->priv->show_frame)
-		gth_image_viewer_show_frame (self->priv->viewer, FRAME_BORDER);
 }
 
 
@@ -202,8 +193,6 @@ gth_image_dragger_unset_viewer (GthImageViewerTool *base,
 {
 	GthImageDragger *self = GTH_IMAGE_DRAGGER (base);
 
-	if ((self->priv->viewer != NULL) && self->priv->show_frame)
-		gth_image_viewer_hide_frame (self->priv->viewer);
 	g_object_remove_weak_pointer (G_OBJECT (image_viewer),  (gpointer *) &self->priv->viewer);
 	self->priv->viewer = NULL;
 }

pix/gth-image-overview.c

@@ -325,22 +325,18 @@ _gth_image_overview_update_preview (GthImageOverview *self)
 static void
 _gth_image_overview_update_visible_area (GthImageOverview *self)
 {
-	int frame_border;
-
 	if (self->priv->viewer == NULL)
 		return;
 
-	frame_border = gth_image_viewer_get_frame_border (self->priv->viewer);
-
 	/* visible area size */
 
 	self->priv->visible_area.width = self->priv->viewer->visible_area.width * self->priv->zoom_factor;
 	self->priv->visible_area.height = self->priv->viewer->visible_area.height * self->priv->zoom_factor;
 
 	/* visible area position */
 
-	self->priv->visible_area.x = (self->priv->viewer->visible_area.x - frame_border) * self->priv->zoom_factor + IMAGE_BORDER;
-	self->priv->visible_area.y = (self->priv->viewer->visible_area.y - frame_border) * self->priv->zoom_factor + IMAGE_BORDER;
+	self->priv->visible_area.x = self->priv->viewer->visible_area.x * self->priv->zoom_factor + IMAGE_BORDER;
+	self->priv->visible_area.y = self->priv->viewer->visible_area.y * self->priv->zoom_factor + IMAGE_BORDER;
 
 	gtk_widget_queue_draw (GTK_WIDGET (self));
 }

pix/gth-image-selector.c

@@ -323,8 +323,8 @@ get_event_area_from_position (GthImageSelector *self,
 		cairo_rectangle_int_t  widget_area;
 
 		widget_area = event_area->area;
-		widget_area.x += MAX (self->priv->viewer->image_area.x, gth_image_viewer_get_frame_border (self->priv->viewer));
-		widget_area.y += MAX (self->priv->viewer->image_area.y, gth_image_viewer_get_frame_border (self->priv->viewer));
+		widget_area.x += self->priv->viewer->image_area.x;
+		widget_area.y += self->priv->viewer->image_area.y;
 
 		if (point_in_rectangle (x, y, widget_area))
 			return event_area;
@@ -617,7 +617,6 @@ gth_image_selector_set_viewer (GthImageViewerTool *base,
 	GthImageSelector *self = GTH_IMAGE_SELECTOR (base);
 
 	self->priv->viewer = image_viewer;
-	gth_image_viewer_show_frame (self->priv->viewer, 25);
 }
 
 
@@ -627,8 +626,6 @@ gth_image_selector_unset_viewer (GthImageViewerTool *base,
 {
 	GthImageSelector *self = GTH_IMAGE_SELECTOR (base);
 
-	if (self->priv->viewer != NULL)
-		gth_image_viewer_hide_frame (self->priv->viewer);
 	self->priv->viewer = NULL;
 }
 
@@ -731,11 +728,7 @@ paint_selection (GthImageSelector *self,
 	cairo_rectangle_int_t selection_area;
 
 	if (! self->priv->viewer->dragging) {
-		int frame_border = gth_image_viewer_get_frame_border (self->priv->viewer);
-
 		selection_area = self->priv->selection_area;
-		selection_area.x += frame_border;
-		selection_area.y += frame_border;
 		gth_image_viewer_paint_region (self->priv->viewer,
 					       cr,
 					       self->priv->surface,