summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-12-26 19:55:08 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-13 15:05:40 +0100
commita461e0a356a76f81076d78dd3b08a854884cdeeb (patch)
tree85e3fabcbd950789ac30dd0649ce29d578d69f26
parent2848d0359a8bc433ba9de56ccc93a04d2f6bbdf2 (diff)
downloadcaja-a461e0a356a76f81076d78dd3b08a854884cdeeb.tar.bz2
caja-a461e0a356a76f81076d78dd3b08a854884cdeeb.tar.xz
GTK3 icon-dnd: fix DnD highlighting regression
taken from: https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=7bd06fa
-rw-r--r--libcaja-private/caja-icon-dnd.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index 376490dc..38820aa9 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -1611,11 +1611,17 @@ drag_highlight_expose (GtkWidget *widget,
gpointer data)
#endif
{
+#if GTK_CHECK_VERSION(3,0,0)
+ gint width, height;
+#else
gint x, y, width, height;
+#endif
GdkWindow *window;
+#if !GTK_CHECK_VERSION(3,0,0)
x = gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget)));
y = gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget)));
+#endif
window = gtk_widget_get_window (widget);
width = gdk_window_get_width (window);
@@ -1626,7 +1632,7 @@ drag_highlight_expose (GtkWidget *widget,
cr,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
widget, "dnd",
- x, y, width, height);
+ 0, 0, width, height);
#else
gtk_paint_shadow (gtk_widget_get_style (widget), window,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
@@ -1638,7 +1644,11 @@ drag_highlight_expose (GtkWidget *widget,
cairo_set_line_width (cr, 1.0);
cairo_set_source_rgb (cr, 0, 0, 0);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ cairo_rectangle (cr, 0.5, 0.5, width - 1, height - 1);
+#else
cairo_rectangle (cr, x + 0.5, y + 0.5, width - 1, height - 1);
+#endif
cairo_stroke (cr);
#if !GTK_CHECK_VERSION(3,0,0)
cairo_destroy (cr);