Dominique Leuenberger
3d5d304f42
- Add evolution-bgo769062-mouseover-crash.patch: fix crash on mouse over task when tasks are grouped. - Add evolution-bgo768683-cannot-mark-as-spam.patch: allow marking a non-spam message as spam in a junk folder (bgo#768683). OBS-URL: https://build.opensuse.org/request/show/416776 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=306
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From b8c2ca1a59b3cd84f034c4514b9ffd8f8607aa11 Mon Sep 17 00:00:00 2001
|
|
From: Milan Crha <mcrha@redhat.com>
|
|
Date: Tue, 2 Aug 2016 18:48:26 +0200
|
|
Subject: [PATCH] Bug 769062 - Crash on mouse over task when tasks are grouped
|
|
|
|
---
|
|
e-util/e-table-group-container.c | 17 ++++++++++++++---
|
|
1 file changed, 14 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/e-util/e-table-group-container.c b/e-util/e-table-group-container.c
|
|
index 0069e43..850e018 100644
|
|
--- a/e-util/e-table-group-container.c
|
|
+++ b/e-util/e-table-group-container.c
|
|
@@ -835,16 +835,27 @@ etgc_get_cell_geometry (ETableGroup *etg,
|
|
for (list = etgc->children; list; list = list->next) {
|
|
ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
|
|
ETableGroup *child = child_node->child;
|
|
- gint thisy;
|
|
+ gint thisy = 0;
|
|
+ gdouble group_header_y1 = 0.0, group_header_y2 = 0.0;
|
|
|
|
e_table_group_get_cell_geometry (child, row, col, x, &thisy, width, height);
|
|
ypos += thisy;
|
|
if ((*row == -1) || (*col == -1)) {
|
|
ypos += TITLE_HEIGHT;
|
|
- *x += GROUP_INDENT;
|
|
- *y = ypos;
|
|
+ if (x)
|
|
+ *x += GROUP_INDENT;
|
|
+ if (y)
|
|
+ *y = ypos;
|
|
return;
|
|
}
|
|
+
|
|
+ g_object_get (
|
|
+ child_node->rect,
|
|
+ "y1", &group_header_y1,
|
|
+ "y2", &group_header_y2,
|
|
+ NULL);
|
|
+
|
|
+ ypos += group_header_y2 - group_header_y1;
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.6.6
|
|
|