diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-11 17:56:38 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:07:35 +0100 |
| commit | 8e4612599a9a6cb1f380dd6cbef9ad3d885cf77f (patch) | |
| tree | f40557e2f5ff87915fd34e250942ab01810d0446 | |
| parent | 412486b1f4c8a0a60d9aa07b39e38ed66852ae3d (diff) | |
| download | caja-8e4612599a9a6cb1f380dd6cbef9ad3d885cf77f.tar.bz2 caja-8e4612599a9a6cb1f380dd6cbef9ad3d885cf77f.tar.xz | |
GTK3 icon-canvas-item: don't draw pango layouts when renaming
Fixes a regression introduced in commit
3a858857fff5e1d7e0bffcec63fea6d2a933ce27 that causes unwanted text to be
drawn while renaming a file in icon view.
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=f07aa75
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 69b06bee..3d719d5a 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -1478,7 +1478,8 @@ draw_label_text (CajaIconCanvasItem *item, x = text_rect.x0 + ((text_rect.x1 - text_rect.x0) - max_text_width) / 2; } - if (have_editable) + if (have_editable && + !details->is_renaming) { state = GTK_STATE_FLAG_NORMAL; @@ -1505,7 +1506,8 @@ draw_label_text (CajaIconCanvasItem *item, gtk_style_context_restore (context); } - if (have_additional) + if (have_additional && + !details->is_renaming) { state = GTK_STATE_FLAG_NORMAL; |