From c4e2b5d53b82c9f82099d8e6c89a82f88458f223 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 19 Nov 2012 14:59:33 +0200 Subject: [lc-p] revise rendering-cleanup commit 2a4433a562 mainly, in icon-dnd, in drag_begin_callback, CajaIconContainer was only declared for GTK2. Also, replace some deprecated gdk_drawable_get(size|screen) calls, and remove some unnecessary GDK_DRAWABLE casts. Also, in icon-canvas-item, in draw_label_text, missed ommitting a NULL parameter to gtk_paint_focus, for GTK3. --- libcaja-private/caja-icon-canvas-item.c | 16 +++++++++------- libcaja-private/caja-icon-container.c | 4 +--- libcaja-private/caja-icon-dnd.c | 27 +++++++-------------------- 3 files changed, 17 insertions(+), 30 deletions(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index f36f2ccf..45e6f98b 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -622,7 +622,7 @@ caja_icon_canvas_item_get_image (CajaIconCanvasItem *item, pixmap = gdk_pixmap_new (gdk_screen_get_root_window (screen), width, height, gdk_visual_get_depth (gdk_colormap_get_visual (colormap))); - gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap); + gdk_drawable_set_colormap (pixmap, colormap); pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, @@ -690,11 +690,11 @@ caja_icon_canvas_item_get_image (CajaIconCanvasItem *item, cairo_paint (cr); cairo_destroy (cr); - draw_embedded_text (item, GDK_DRAWABLE (pixmap), + draw_embedded_text (item, pixmap, item_offset_x, item_offset_y); - draw_label_text (item, GDK_DRAWABLE (pixmap), FALSE, icon_rect); - draw_label_text (item, GDK_DRAWABLE (*mask), TRUE, icon_rect); + draw_label_text (item, pixmap, FALSE, icon_rect); + draw_label_text (item, *mask, TRUE, icon_rect); g_object_unref (pixbuf); @@ -1624,7 +1624,9 @@ draw_label_text (CajaIconCanvasItem *item, drawable, #endif needs_highlight ? GTK_STATE_SELECTED : GTK_STATE_NORMAL, +#if !GTK_CHECK_VERSION(3,0,0) NULL, +#endif GTK_WIDGET (EEL_CANVAS_ITEM (item)->canvas), "icon-container", text_rect.x0, @@ -1704,11 +1706,11 @@ get_knob_pixbuf (void) } static void -#if GTK_CHECK_VERSION(3,0,0) draw_stretch_handles (CajaIconCanvasItem *item, +#if GTK_CHECK_VERSION(3,0,0) cairo_t *cr, #else -draw_stretch_handles (CajaIconCanvasItem *item, GdkDrawable *drawable, + GdkDrawable *drawable, #endif const EelIRect *rect) { @@ -2228,7 +2230,7 @@ caja_icon_canvas_item_draw (EelCanvasItem *item, GdkDrawable *drawable, #if GTK_CHECK_VERSION(3,0,0) draw_embedded_text (icon_item, cr, icon_rect.x0, icon_rect.y0); #else - draw_embedded_text (icon_item, drawable, icon_rect.x0, icon_rect.y0); + draw_embedded_text (icon_item, drawable, icon_rect.x0, icon_rect.y0); #endif is_rtl = caja_icon_container_is_layout_rtl (CAJA_ICON_CONTAINER (item->canvas)); diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 6b2f18e8..2b38220c 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -5252,14 +5252,12 @@ caja_icon_container_search_position_func (CajaIconContainer *container, gdk_window_get_origin (cont_window, &cont_x, &cont_y); -#if GTK_CHECK_VERSION(3, 0, 0) cont_width = gdk_window_get_width (cont_window); cont_height = gdk_window_get_height (cont_window); +#if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_get_preferred_size (search_dialog, &requisition, NULL); #else - gdk_drawable_get_size (cont_window, &cont_width, &cont_height); - gtk_widget_size_request (search_dialog, &requisition); #endif diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c index cae6e4ee..bd642684 100644 --- a/libcaja-private/caja-icon-dnd.c +++ b/libcaja-private/caja-icon-dnd.c @@ -1505,15 +1505,15 @@ drag_begin_callback (GtkWidget *widget, GdkDragContext *context, gpointer data) { + CajaIconContainer *container; #if GTK_CHECK_VERSION(3,0,0) cairo_surface_t *surface; #else - CajaIconContainer *container; - GdkScreen *screen; - GdkColormap *colormap; + GdkScreen *screen = gtk_widget_get_screen (widget); + GdkColormap *colormap = NULL; GdkPixmap *pixmap; GdkBitmap *mask; - gboolean use_mask; + gboolean use_mask = FALSE; #endif double x1, y1, x2, y2, winx, winy; int x_offset, y_offset; @@ -1522,16 +1522,8 @@ drag_begin_callback (GtkWidget *widget, container = CAJA_ICON_CONTAINER (widget); #if !GTK_CHECK_VERSION(3,0,0) - screen = gtk_widget_get_screen (widget); - colormap = NULL; if (gdk_screen_is_composited (screen)) - { colormap = gdk_screen_get_rgba_colormap (screen); - if (colormap != NULL) - { - use_mask = FALSE; - } - } /* Fall back on using the same colormap as the widget */ if (colormap == NULL) @@ -1568,18 +1560,15 @@ drag_begin_callback (GtkWidget *widget, #else if (!use_mask && pixmap != NULL) { - cairo_t *cr; - /* If composite works, make the icons partially transparent */ - cr = gdk_cairo_create (pixmap); + cairo_t *cr = gdk_cairo_create (pixmap); cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OUT); cairo_set_source_rgba(cr, 1,0,0,0.35); cairo_paint (cr); cairo_destroy (cr); } - gtk_drag_set_icon_pixmap (context, - colormap, + gtk_drag_set_icon_pixmap (context, colormap, pixmap, (use_mask ? mask : NULL), x_offset, y_offset); #endif @@ -1636,18 +1625,16 @@ drag_highlight_expose (GtkWidget *widget, y = gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget))); window = gtk_widget_get_window (widget); -#if GTK_CHECK_VERSION(3, 0, 0) width = gdk_window_get_width (window); height = gdk_window_get_height (window); +#if GTK_CHECK_VERSION (3, 0, 0) gtk_paint_shadow (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_OUT, widget, "dnd", x, y, width, height); #else - gdk_drawable_get_size(window, &width, &height); - gtk_paint_shadow (gtk_widget_get_style (widget), window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, widget, "dnd", -- cgit v1.2.1