elementary OS

Merge lp:~nathandyer/elementaryos/geary-freya-kill-separator into lp:~elementary-os/elementaryos/geary-freya

  1. geary-freya-kill-separator
  2. Merge into geary-freya
Proposed by Nathan Dyer
Status: Merged
Approved by: Danielle Foré
Approved revision: 16
Merged at revision: 16
Proposed branch: lp:~nathandyer/elementaryos/geary-freya-kill-separator
Merge into: lp:~elementary-os/elementaryos/geary-freya
Diff against target: 19 lines (+0/-9)
1 file modified
src/client/conversation-list/formatted-conversation-data.vala (+0/-9)
To merge this branch: bzr merge lp:~nathandyer/elementaryos/geary-freya-kill-separator
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+245435@code.launchpad.net

Description of the change

Removes the custom drawing of an additional separator line between conversations.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/conversation-list/formatted-conversation-data.vala'
2--- src/client/conversation-list/formatted-conversation-data.vala 2014-07-26 10:08:43 +0000
3+++ src/client/conversation-list/formatted-conversation-data.vala 2014-12-29 22:05:36 +0000
4@@ -297,15 +297,6 @@
5 y += ink_rect.height + ink_rect.y + LINE_SPACING;
6 }
7
8- // Draw separator line.
9- if (ctx != null && cell_area != null) {
10- ctx.set_line_width(1.0);
11- GtkUtil.set_source_color_from_string(ctx, CountBadge.UNREAD_BG_COLOR);
12- ctx.move_to(cell_area.x - 1, cell_area.y + cell_area.height);
13- ctx.line_to(cell_area.x + cell_area.width + 1, cell_area.y + cell_area.height);
14- ctx.stroke();
15- }
16-
17 if (recalc_dims) {
18 FormattedConversationData.preview_height = preview_height;
19 FormattedConversationData.cell_height = y + preview_height;

Subscribers

People subscribed via source and target branches