From 92ff8b1860812a2cb58bfb492765b109411d8fd5 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 13:22:16 +0200 Subject: [eel] port eel-gdk-extensions to cairo drawing http://git.gnome.org/browse/nautilus/commit/?id=917a27a6f69509720fadd0d50e40dbc87ae9f5d2 --- eel/eel-gdk-extensions.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'eel/eel-gdk-extensions.h') diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h index 91518186..69f29e62 100644 --- a/eel/eel-gdk-extensions.h +++ b/eel/eel-gdk-extensions.h @@ -120,10 +120,6 @@ char * eel_gdk_rgb_to_color_spec (guint32 gboolean eel_gdk_color_is_dark (GdkColor *color); -/* A routine to get a 50% gray stippled bitmap for use in some types of highlighting. */ -GdkBitmap * eel_stipple_bitmap_for_screen (GdkScreen *screen); -GdkBitmap * eel_stipple_bitmap (void); - /* Misc GdkRectangle helper functions */ gboolean eel_gdk_rectangle_contains_rectangle (GdkRectangle outer, @@ -155,7 +151,6 @@ EelGdkGeometryFlags eel_gdk_parse_geometry (const char guint *width_return, guint *height_return); void eel_gdk_draw_layout_with_drop_shadow (GdkDrawable *drawable, - GdkGC *gc, GdkColor *text_color, GdkColor *shadow_color, int x, -- cgit v1.2.1 From f61503852a1ba50b0a258438e7ce3ca4c7545f45 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 16:07:45 +0200 Subject: [eel] remove unused code from eel-gdk-extensions http://git.gnome.org/browse/nautilus/commit/?id=6b2a053985b8c37aa1038e7a01ab05d7dd15aa2e --- eel/eel-gdk-extensions.h | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'eel/eel-gdk-extensions.h') diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h index 69f29e62..ca253403 100644 --- a/eel/eel-gdk-extensions.h +++ b/eel/eel-gdk-extensions.h @@ -98,16 +98,8 @@ char * eel_gradient_set_bottom_color_spec (const char /* A version of parse_color that substitutes a default color instead of returning a boolean to indicate it cannot be parsed. */ -void eel_gdk_color_parse_with_default (const char *color_spec, - const GdkColor *default_color, - GdkColor *parsed_color); void eel_gdk_color_parse_with_white_default (const char *color_spec, GdkColor *parsed_color); -guint32 eel_parse_rgb_with_default (const char *color_spec, - guint32 default_rgb); -guint32 eel_parse_rgb_with_white_default (const char *color_spec); -guint32 eel_rgb_shift_color (guint32 color, - float shift_by); guint32 eel_rgb16_to_rgb (gushort r, gushort g, gushort b); @@ -121,28 +113,9 @@ char * eel_gdk_rgb_to_color_spec (guint32 gboolean eel_gdk_color_is_dark (GdkColor *color); -/* Misc GdkRectangle helper functions */ -gboolean eel_gdk_rectangle_contains_rectangle (GdkRectangle outer, - GdkRectangle inner); - - -/* A basic operation we use for drawing gradients is interpolating two colors.*/ -guint32 eel_interpolate_color (gdouble ratio, - guint32 start_rgb, - guint32 end_rgb); - /* Misc GdkWindow helper functions */ -void eel_gdk_window_bring_to_front (GdkWindow *window); -void eel_gdk_window_set_invisible_cursor (GdkWindow *window); void eel_gdk_window_focus (GdkWindow *window, guint32 timestamp); -void eel_gdk_window_set_wm_protocols (GdkWindow *window, - GdkAtom *protocols, - int nprotocols); - - -void eel_gdk_window_set_wm_hints_input (GdkWindow *w, - gboolean status); /* Wrapper for XParseGeometry */ EelGdkGeometryFlags eel_gdk_parse_geometry (const char *string, -- cgit v1.2.1 From 235ac60d2e47057b7e1943c19e9126927888a301 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 11:00:28 +0200 Subject: [eel] remove eel_gdk_window_focus http://git.gnome.org/browse/nautilus/commit/?id=7e8d1dfa6a17fe9189bf2489b735cd6462f03571\ --- eel/eel-gdk-extensions.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'eel/eel-gdk-extensions.h') diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h index ca253403..a879bdce 100644 --- a/eel/eel-gdk-extensions.h +++ b/eel/eel-gdk-extensions.h @@ -112,11 +112,6 @@ char * eel_gdk_rgb_to_color_spec (guint32 gboolean eel_gdk_color_is_dark (GdkColor *color); - -/* Misc GdkWindow helper functions */ -void eel_gdk_window_focus (GdkWindow *window, - guint32 timestamp); - /* Wrapper for XParseGeometry */ EelGdkGeometryFlags eel_gdk_parse_geometry (const char *string, int *x_return, -- cgit v1.2.1 From 8af0b94b1f4df47364abc9f7f02cc467ecd1cdee Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Wed, 7 Nov 2012 17:27:04 +0200 Subject: [eel-gdk-extensions] Add eel_cairo_draw_layout_with_drop_shadow for GTK3 keeping eel_gdk_draw_layout_with_drop_shadow for GTK2 http://git.gnome.org/browse/nautilus/commit/?id=d2f141f4a5435b10b43abea0822e3d0569b67886 --- eel/eel-gdk-extensions.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'eel/eel-gdk-extensions.h') diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h index a879bdce..2036eec4 100644 --- a/eel/eel-gdk-extensions.h +++ b/eel/eel-gdk-extensions.h @@ -28,6 +28,10 @@ #include +#ifndef GTK_CHECK_VERSION +#include +#endif + #define EEL_RGB_COLOR_RED 0xFF0000 #define EEL_RGB_COLOR_GREEN 0x00FF00 #define EEL_RGB_COLOR_BLUE 0x0000FF @@ -118,10 +122,14 @@ EelGdkGeometryFlags eel_gdk_parse_geometry (const char int *y_return, guint *width_return, guint *height_return); +#if GTK_CHECK_VERSION(3,0,0) +void eel_cairo_draw_layout_with_drop_shadow (cairo_t *cr, +#else void eel_gdk_draw_layout_with_drop_shadow (GdkDrawable *drawable, - GdkColor *text_color, - GdkColor *shadow_color, - int x, - int y, - PangoLayout *layout); +#endif + GdkColor *text_color, + GdkColor *shadow_color, + int x, + int y, + PangoLayout *layout); #endif /* EEL_GDK_EXTENSIONS_H */ -- cgit v1.2.1