summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-09 18:12:16 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-13 15:05:42 +0100
commit8b37981175499c9c876648165ddb7a5f94ae6849 (patch)
tree3c9649e6d46a5473b775c26fe5214ee574fbaec5
parent6698c8b370f2d9aa278b63090cbc9957d7ca0e36 (diff)
downloadcaja-8b37981175499c9c876648165ddb7a5f94ae6849.tar.bz2
caja-8b37981175499c9c876648165ddb7a5f94ae6849.tar.xz
GTK3 icon-canvas-item: make the icon frame transparent when not prelit
This fixes icons on the desktop appearing weird taken from: https://git.gnome.org/browse/nautilus/commit/?id=6a11ecd
-rw-r--r--libcaja-private/caja-icon-canvas-item.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index d57b439f..858a7393 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -1503,20 +1503,19 @@ draw_label_text (CajaIconCanvasItem *item,
NULL);
#if GTK_CHECK_VERSION(3,0,0)
if (!needs_highlight && details->text_width > 0 && details->text_height > 0)
+ {
+ if (prelight_label && item->details->is_prelit) {
+ draw_frame (item,
+ cr,
+ &container->details->prelight_color_rgba,
#else
if (needs_frame && !needs_highlight && details->text_width > 0 && details->text_height > 0)
-#endif
{
if (!(prelight_label && item->details->is_prelit))
{
draw_frame (item,
-#if GTK_CHECK_VERSION(3,0,0)
- cr,
- &container->details->normal_color_rgba,
-#else
drawable,
container->details->normal_color_rgba,
-#endif
create_mask,
text_rect.x0,
text_rect.y0,
@@ -1526,10 +1525,6 @@ draw_label_text (CajaIconCanvasItem *item,
else
{
draw_frame (item,
-#if GTK_CHECK_VERSION(3,0,0)
- cr,
- &container->details->prelight_color_rgba,
-#else
drawable,
container->details->prelight_color_rgba,
#endif