[evolution] Bug 767364 - Tooltips over task/memo list are misplaced
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 767364 - Tooltips over task/memo list are misplaced
- Date: Mon, 13 Jun 2016 21:38:28 +0000 (UTC)
commit 18a0a34557c570e6136860b9d8cbd7b3813082d5
Author: Milan Crha <mcrha redhat com>
Date: Mon Jun 13 23:38:35 2016 +0200
Bug 767364 - Tooltips over task/memo list are misplaced
calendar/gui/e-memo-table.c | 37 ++++++++++++++++++++++++++++++++++++-
calendar/gui/e-task-table.c | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 72 insertions(+), 2 deletions(-)
---
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 1a80643..f4309ee 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -394,7 +394,7 @@ memo_table_query_tooltip (GtkWidget *widget,
EMemoTable *memo_table;
ECalModel *model;
ECalModelComponent *comp_data;
- gint row = -1, col = -1;
+ gint row = -1, col = -1, row_y = -1, row_height = -1;
GtkWidget *box, *l, *w;
GdkRGBA sel_bg, sel_fg, norm_bg, norm_text;
gchar *tmp;
@@ -611,6 +611,41 @@ memo_table_query_tooltip (GtkWidget *widget,
g_object_unref (new_comp);
+ if (esm && esm->sorter && e_sorter_needs_sorting (esm->sorter))
+ row = e_sorter_model_to_sorted (esm->sorter, row);
+
+ e_table_get_cell_geometry (E_TABLE (memo_table), row, 0, NULL, &row_y, NULL, &row_height);
+
+ if (row_y != -1 && row_height != -1) {
+ ETable *etable;
+ GdkRectangle rect;
+ GtkAllocation allocation;
+
+ etable = E_TABLE (memo_table);
+
+ if (etable && etable->table_canvas) {
+ gtk_widget_get_allocation (GTK_WIDGET (etable->table_canvas), &allocation);
+ } else {
+ allocation.x = 0;
+ allocation.y = 0;
+ allocation.width = 0;
+ allocation.height = 0;
+ }
+
+ rect.x = allocation.x;
+ rect.y = allocation.y + row_y - BUTTON_PADDING;
+ rect.width = allocation.width;
+ rect.height = row_height + 2 * BUTTON_PADDING;
+
+ if (etable && etable->header_canvas) {
+ gtk_widget_get_allocation (GTK_WIDGET (etable->header_canvas), &allocation);
+
+ rect.y += allocation.height;
+ }
+
+ gtk_tooltip_set_tip_area (tooltip, &rect);
+ }
+
return TRUE;
}
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index b085bfd..2216e06 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -696,7 +696,7 @@ task_table_query_tooltip (GtkWidget *widget,
ETaskTable *task_table;
ECalModel *model;
ECalModelComponent *comp_data;
- gint row = -1, col = -1;
+ gint row = -1, col = -1, row_y = -1, row_height = -1;
GtkWidget *box, *l, *w;
GdkRGBA sel_bg, sel_fg, norm_bg, norm_text;
gchar *tmp;
@@ -921,6 +921,41 @@ task_table_query_tooltip (GtkWidget *widget,
g_object_unref (new_comp);
+ if (esm && esm->sorter && e_sorter_needs_sorting (esm->sorter))
+ row = e_sorter_model_to_sorted (esm->sorter, row);
+
+ e_table_get_cell_geometry (E_TABLE (task_table), row, 0, NULL, &row_y, NULL, &row_height);
+
+ if (row_y != -1 && row_height != -1) {
+ ETable *etable;
+ GdkRectangle rect;
+ GtkAllocation allocation;
+
+ etable = E_TABLE (task_table);
+
+ if (etable && etable->table_canvas) {
+ gtk_widget_get_allocation (GTK_WIDGET (etable->table_canvas), &allocation);
+ } else {
+ allocation.x = 0;
+ allocation.y = 0;
+ allocation.width = 0;
+ allocation.height = 0;
+ }
+
+ rect.x = allocation.x;
+ rect.y = allocation.y + row_y - BUTTON_PADDING;
+ rect.width = allocation.width;
+ rect.height = row_height + 2 * BUTTON_PADDING;
+
+ if (etable && etable->header_canvas) {
+ gtk_widget_get_allocation (GTK_WIDGET (etable->header_canvas), &allocation);
+
+ rect.y += allocation.height;
+ }
+
+ gtk_tooltip_set_tip_area (tooltip, &rect);
+ }
+
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]