aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/ChangeLog48
-rw-r--r--widgets/table/e-cell-combo.c173
-rw-r--r--widgets/table/e-cell-combo.h2
-rw-r--r--widgets/table/e-cell-date.c3
-rw-r--r--widgets/table/e-cell-text.c7
-rw-r--r--widgets/table/e-table-example-1.c1
-rw-r--r--widgets/table/e-table-field-chooser-dialog.c2
-rw-r--r--widgets/table/e-table-group-container.c21
-rw-r--r--widgets/table/e-table-group-leaf.c11
-rw-r--r--widgets/table/e-table-group.c8
-rw-r--r--widgets/table/e-table-group.h6
-rw-r--r--widgets/table/e-table-header-item.c4
-rw-r--r--widgets/table/e-table.c12
-rw-r--r--widgets/table/e-table.h2
14 files changed, 170 insertions, 130 deletions
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index d2de4354a2..7d556367a8 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,51 @@
+2009-04-24 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #572348
+
+ * e-table-header-item.c:
+ * e-cell-combo.h:
+ * e-cell-combo.c:
+ Remove deprecated Gtk+ symbols.
+
+2009-03-26 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #576694
+
+ * e-cell-text.c (build_layout):
+ Handle absolute font sizes correctly.
+
+2009-02-26 Chenthill Palanisamy <pchenthill@novell.com>
+
+ ** Part of fix for bug #573198
+
+ * e-cell-date.c (ecd_get_text): Initialize the timezone settings
+ before making any timezone conversion calls.
+
+2009-02-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #572348
+
+ * e-table-example-1.c (main):
+ gtk_widget_push_visual() is a no-op. Remove it.
+
+2009-02-19 Andre Klapper <a9016009@gmx.de>
+
+ * e-table-field-chooser-dialog.c:
+ Migrate from deprecated gtk_window_set_policy to gtk_window_set_resizable
+
+2009-02-16 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #550114
+
+ * e-table-group.h:
+ * e-table-group.c:
+ * e-table-group-container.c:
+ * e-table-group-leaf.c:
+ Replaced 'compute_mouse_over' with 'get_mouse_over', now works
+ with cached values 'motion_row', 'motion_col'.
+ * e-table.c: (e_table_get_mouse_over_cell):
+ Mouse position not required anymore, remove it too then.
+
2008-12-15 Milan Crha <mcrha@redhat.com>
** Fix for bug #557176
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 34de0fb29e..84d58200d2 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -74,10 +74,6 @@
/* The height to make the popup list if there aren't any items in it. */
#define E_CELL_COMBO_LIST_EMPTY_HEIGHT 15
-/* The object data key used to store the UTF-8 text of the popup list items. */
-#define E_CELL_COMBO_UTF8_KEY "UTF-8-TEXT"
-
-
static void e_cell_combo_class_init (ECellComboClass *klass);
static void e_cell_combo_init (ECellCombo *ecc);
static void e_cell_combo_dispose (GObject *object);
@@ -98,9 +94,7 @@ static void e_cell_combo_get_popup_pos (ECellCombo *ecc,
gint *height,
gint *width);
-static void e_cell_combo_selection_changed (GtkWidget *popup_list, ECellCombo *ecc);
-
-static gint e_cell_combo_list_button_press (GtkWidget *popup_list, GdkEvent *event, ECellCombo *ecc);
+static void e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc);
static gint e_cell_combo_button_press (GtkWidget *popup_window,
GdkEvent *event,
@@ -134,6 +128,8 @@ e_cell_combo_init (ECellCombo *ecc)
{
GtkWidget *frame;
AtkObject *a11y;
+ GtkListStore *store;
+ GtkTreeSelection *selection;
/* We create one popup window for the ECell, since there will only
ever be one popup in use at a time. */
@@ -156,27 +152,32 @@ e_cell_combo_init (ECellCombo *ecc)
gtk_container_add (GTK_CONTAINER (frame), ecc->popup_scrolled_window);
gtk_widget_show (ecc->popup_scrolled_window);
- ecc->popup_list = gtk_list_new ();
- gtk_list_set_selection_mode (GTK_LIST (ecc->popup_list),
- GTK_SELECTION_BROWSE);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window), ecc->popup_list);
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (ecc->popup_list),
+ store = gtk_list_store_new (1, G_TYPE_STRING);
+ ecc->popup_tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+ g_object_unref (store);
+
+ gtk_tree_view_append_column (
+ GTK_TREE_VIEW (ecc->popup_tree_view),
+ gtk_tree_view_column_new_with_attributes ("Text", gtk_cell_renderer_text_new (), "text", 0, NULL));
+
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ecc->popup_tree_view), FALSE);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ecc->popup_tree_view));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window), ecc->popup_tree_view);
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (ecc->popup_tree_view),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
- gtk_container_set_focus_hadjustment (GTK_CONTAINER (ecc->popup_list),
+ gtk_container_set_focus_hadjustment (GTK_CONTAINER (ecc->popup_tree_view),
gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
- gtk_widget_show (ecc->popup_list);
+ gtk_widget_show (ecc->popup_tree_view);
- a11y = gtk_widget_get_accessible (ecc->popup_list);
+ a11y = gtk_widget_get_accessible (ecc->popup_tree_view);
atk_object_set_name (a11y, _("popup list"));
- g_signal_connect (ecc->popup_list,
- "selection_changed",
+ g_signal_connect (selection,
+ "changed",
G_CALLBACK (e_cell_combo_selection_changed),
ecc);
- g_signal_connect (ecc->popup_list,
- "button_press_event",
- G_CALLBACK (e_cell_combo_list_button_press),
- ecc);
g_signal_connect (ecc->popup_window,
"button_press_event",
G_CALLBACK (e_cell_combo_button_press),
@@ -231,26 +232,20 @@ e_cell_combo_set_popdown_strings (ECellCombo *ecc,
GList *strings)
{
GList *elem;
- GtkWidget *listitem;
+ GtkListStore *store;
g_return_if_fail (E_IS_CELL_COMBO (ecc));
g_return_if_fail (strings != NULL);
- gtk_list_clear_items (GTK_LIST (ecc->popup_list), 0, -1);
- elem = strings;
- while (elem) {
- char *utf8_text = elem->data;
-
- listitem = gtk_list_item_new_with_label (utf8_text);
+ store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view)));
+ gtk_list_store_clear (store);
- gtk_widget_show (listitem);
- gtk_container_add (GTK_CONTAINER (ecc->popup_list), listitem);
-
- g_object_set_data_full (G_OBJECT (listitem),
- E_CELL_COMBO_UTF8_KEY,
- g_strdup (utf8_text), g_free);
+ for (elem = strings; elem; elem = elem->next) {
+ GtkTreeIter iter;
+ char *utf8_text = elem->data;
- elem = elem->next;
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter, 0, utf8_text, -1);
}
}
@@ -264,20 +259,22 @@ e_cell_combo_do_popup (ECellPopup *ecp,
ECellCombo *ecc = E_CELL_COMBO (ecp);
guint32 time;
gint error_code;
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ecc->popup_tree_view));
- g_signal_handlers_block_by_func(ecc->popup_list, e_cell_combo_selection_changed, ecc);
+ g_signal_handlers_block_by_func (selection, e_cell_combo_selection_changed, ecc);
e_cell_combo_show_popup (ecc, row, view_col);
e_cell_combo_select_matching_item (ecc);
- g_signal_handlers_unblock_by_func(ecc->popup_list, e_cell_combo_selection_changed, ecc);
+ g_signal_handlers_unblock_by_func (selection, e_cell_combo_selection_changed, ecc);
if (event->type == GDK_BUTTON_PRESS) {
- GTK_LIST (ecc->popup_list)->drag_selection = TRUE;
time = event->button.time;
} else {
time = event->key.time;
}
- error_code = gdk_pointer_grab (ecc->popup_list->window, TRUE,
+ error_code = gdk_pointer_grab (gtk_widget_get_window (ecc->popup_tree_view), TRUE,
GDK_ENTER_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
@@ -287,7 +284,7 @@ e_cell_combo_do_popup (ECellPopup *ecp,
if (error_code != 0)
g_warning ("Failed to get pointer grab (%i)", error_code);
gtk_grab_add (ecc->popup_window);
- gdk_keyboard_grab (ecc->popup_list->window, TRUE, time);
+ gdk_keyboard_grab (gtk_widget_get_window (ecc->popup_tree_view), TRUE, time);
return TRUE;
}
@@ -301,45 +298,45 @@ e_cell_combo_select_matching_item (ECellCombo *ecc)
ECellText *ecell_text = E_CELL_TEXT (ecp->child);
ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
ETableCol *ecol;
- GtkList *list;
- GtkWidget *listitem;
- GList *elem;
gboolean found = FALSE;
- char *cell_text, *list_item_text;
+ char *cell_text;
+ gboolean valid;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
cell_text = e_cell_text_get_text (ecell_text, ecv->e_table_model,
ecol->col_idx, ecp->popup_row);
- list = GTK_LIST (ecc->popup_list);
- elem = list->children;
- while (elem) {
- listitem = GTK_WIDGET (elem->data);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view));
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ecc->popup_tree_view));
+
+ for (valid = gtk_tree_model_get_iter_first (model, &iter);
+ valid && !found;
+ valid = gtk_tree_model_iter_next (model, &iter)) {
+ char *str = NULL;
- /* We need to compare against the UTF-8 text. */
- list_item_text = g_object_get_data (G_OBJECT (listitem),
- E_CELL_COMBO_UTF8_KEY);
+ gtk_tree_model_get (model, &iter, 0, &str, -1);
+
+ if (str && g_str_equal (str, cell_text)) {
+ GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
+
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (ecc->popup_tree_view), path, NULL, FALSE);
+ gtk_tree_path_free (path);
- if (list_item_text && !strcmp (list_item_text, cell_text)) {
found = TRUE;
- gtk_list_select_child (list, listitem);
- gtk_widget_grab_focus (listitem);
- break;
}
- elem = elem->next;
+ g_free (str);
}
- if (!found) {
- gtk_list_unselect_all (list);
- if (list->children)
- gtk_widget_grab_focus (GTK_WIDGET (list->children->data));
- }
+ if (!found)
+ gtk_tree_selection_unselect_all (selection);
e_cell_text_free_text (ecell_text, cell_text);
}
-
static void
e_cell_combo_show_popup (ECellCombo *ecc, int row, int view_col)
{
@@ -357,7 +354,7 @@ e_cell_combo_show_popup (ECellCombo *ecc, int row, int view_col)
gtk_widget_hide (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)->vscrollbar);
}
- gtk_widget_set_uposition (ecc->popup_window, x, y);
+ gtk_window_move (GTK_WINDOW (ecc->popup_window), x, y);
gtk_widget_set_size_request (ecc->popup_window, width, height);
gtk_widget_realize (ecc->popup_window);
gdk_window_resize (ecc->popup_window->window, width, height);
@@ -429,10 +426,10 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
screen_width = gdk_screen_width ();
avail_width = screen_width - scrollbar_width;
- gtk_widget_size_request (ecc->popup_list, &list_requisition);
+ gtk_widget_size_request (ecc->popup_tree_view, &list_requisition);
min_height = MIN (list_requisition.height,
popup->vscrollbar->requisition.height);
- if (!GTK_LIST (ecc->popup_list)->children)
+ if (!gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view)), NULL))
list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT;
/* Calculate the desired width. */
@@ -503,32 +500,16 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc,
}
static void
-e_cell_combo_selection_changed(GtkWidget *popup_list, ECellCombo *ecc)
+e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc)
{
- if (!GTK_LIST(popup_list)->selection || !GTK_WIDGET_REALIZED(ecc->popup_window))
- return;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
- e_cell_combo_restart_edit (ecc);
-}
-
-static gint
-e_cell_combo_list_button_press(GtkWidget *popup_list, GdkEvent *event, ECellCombo *ecc)
-{
- g_return_val_if_fail (GTK_IS_LIST(popup_list), FALSE);
+ if (!GTK_WIDGET_REALIZED (ecc->popup_window) || !gtk_tree_selection_get_selected (selection, &model, &iter))
+ return;
e_cell_combo_update_cell (ecc);
- gtk_grab_remove (ecc->popup_window);
- gdk_pointer_ungrab (event->button.time);
- gdk_keyboard_ungrab (event->button.time);
- gtk_widget_hide (ecc->popup_window);
-
- e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
- d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
-
e_cell_combo_restart_edit (ecc);
-
- return TRUE;
-
}
/* This handles button press events in the popup window.
@@ -553,7 +534,7 @@ e_cell_combo_button_press (GtkWidget *popup_window,
which is why we hide the popup in this case. */
while (event_widget) {
event_widget = event_widget->parent;
- if (event_widget == ecc->popup_list)
+ if (event_widget == ecc->popup_tree_view)
return FALSE;
}
@@ -590,11 +571,11 @@ e_cell_combo_button_release (GtkWidget *popup_window,
event_widget = gtk_get_event_widget ((GdkEvent*) event);
/* See if the button was released in the list (or its children). */
- while (event_widget && event_widget != ecc->popup_list)
+ while (event_widget && event_widget != ecc->popup_tree_view)
event_widget = event_widget->parent;
/* If it wasn't, then we just ignore the event. */
- if (event_widget != ecc->popup_list)
+ if (event_widget != ecc->popup_tree_view)
return FALSE;
/* The button was released inside the list, so we hide the popup and
@@ -657,18 +638,17 @@ e_cell_combo_update_cell (ECellCombo *ecc)
ECellText *ecell_text = E_CELL_TEXT (ecp->child);
ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
ETableCol *ecol;
- GtkList *list = GTK_LIST (ecc->popup_list);
- GtkListItem *listitem;
- gchar *text, *old_text;
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ecc->popup_tree_view));
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *text = NULL, *old_text;
/* Return if no item is selected. */
- if (list->selection == NULL)
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
/* Get the text of the selected item. */
- listitem = list->selection->data;
- text = g_object_get_data (G_OBJECT (listitem),
- E_CELL_COMBO_UTF8_KEY);
+ gtk_tree_model_get (model, &iter, 0, &text, -1);
g_return_if_fail (text != NULL);
/* Compare it with the existing cell contents. */
@@ -684,6 +664,7 @@ e_cell_combo_update_cell (ECellCombo *ecc)
}
e_cell_text_free_text (ecell_text, old_text);
+ g_free (text);
}
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
index b7cc928e25..2e801f3711 100644
--- a/widgets/table/e-cell-combo.h
+++ b/widgets/table/e-cell-combo.h
@@ -45,7 +45,7 @@ typedef struct {
GtkWidget *popup_window;
GtkWidget *popup_scrolled_window;
- GtkWidget *popup_list;
+ GtkWidget *popup_tree_view;
} ECellCombo;
typedef struct {
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index 1ec554515e..ac0274f183 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -54,7 +54,8 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row)
if (date == 0) {
return g_strdup (_("?"));
}
-
+
+ tzset ();
localtime_r (&date, &then);
localtime_r (&nowdate, &now);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index ee1934ae59..e50d3d7ae7 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -594,16 +594,21 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width)
PangoFontDescription *desc = NULL, *fixed_desc = NULL;
char *fixed_family = NULL;
gint fixed_size = 0;
+ gboolean fixed_points = TRUE;
fixed_desc = pango_font_description_from_string (ect->font_name);
if (fixed_desc) {
fixed_family = (char *)pango_font_description_get_family (fixed_desc);
fixed_size = pango_font_description_get_size (fixed_desc);
+ fixed_points = !pango_font_description_get_size_is_absolute (fixed_desc);
}
desc = pango_font_description_copy (gtk_widget_get_style (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas))->font_desc);
pango_font_description_set_family (desc, fixed_family);
- pango_font_description_set_size (desc, fixed_size);
+ if (fixed_points)
+ pango_font_description_set_size (desc, fixed_size);
+ else
+ pango_font_description_set_absolute_size (desc, fixed_size);
/* pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
index e68dda908e..cacef107b7 100644
--- a/widgets/table/e-table-example-1.c
+++ b/widgets/table/e-table-example-1.c
@@ -293,7 +293,6 @@ main (int argc, char *argv [])
gnome_init ("TableExample", "TableExample", argc, argv);
e_cursors_init ();
- gtk_widget_push_visual (gdk_rgb_get_visual ());
gtk_widget_push_colormap (gdk_rgb_get_colormap ());
create_table ();
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index f277795d23..b958fc27bf 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -97,7 +97,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
gtk_dialog_add_button(GTK_DIALOG(e_table_field_chooser_dialog),
GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
- gtk_window_set_policy(GTK_WINDOW(e_table_field_chooser_dialog), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable(GTK_WINDOW(e_table_field_chooser_dialog), TRUE);
widget = e_table_field_chooser_new();
e_table_field_chooser_dialog->etfc = E_TABLE_FIELD_CHOOSER(widget);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 0066b8b482..592cd1eee5 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -688,7 +688,7 @@ etgc_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
}
static void
-etgc_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
+etgc_get_mouse_over (ETableGroup *etg, int *row, int *col)
{
ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg);
@@ -697,18 +697,23 @@ etgc_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
if (col)
*col = -1;
- x -= GROUP_INDENT;
- y -= TITLE_HEIGHT;
-
- if (x >= 0 && y >= 0 && etgc->children) {
+ if (etgc->children) {
+ int row_plus = 0;
GList *list;
+
for (list = etgc->children; list; list = list->next) {
ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
ETableGroup *child = child_node->child;
- e_table_group_compute_mouse_over (child, x, y, row, col);
- if ((*row != -1) && (*col != -1))
+ e_table_group_get_mouse_over (child, row, col);
+
+ if ((!row || *row != -1) && (!col || *col != -1)) {
+ if (row)
+ *row += row_plus;
return;
+ }
+
+ row_plus += e_table_group_row_count (child);
}
}
}
@@ -914,7 +919,7 @@ etgc_class_init (ETableGroupContainerClass *klass)
e_group_class->get_focus_column = etgc_get_focus_column;
e_group_class->get_printable = etgc_get_printable;
e_group_class->compute_location = etgc_compute_location;
- e_group_class->compute_mouse_over = etgc_compute_mouse_over;
+ e_group_class->get_mouse_over = etgc_get_mouse_over;
e_group_class->get_cell_geometry = etgc_get_cell_geometry;
g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 95dc312b0a..dc4c8ba11e 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -408,11 +408,16 @@ etgl_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col)
}
static void
-etgl_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
+etgl_get_mouse_over (ETableGroup *etg, int *row, int *col)
{
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
- e_table_item_compute_mouse_over (etgl->item, x, y, row, col);
+ if (etgl->item && etgl->item->motion_row > -1 && etgl->item->motion_col > -1) {
+ if (row)
+ *row = etgl->item->motion_row;
+ if (col)
+ *col = etgl->item->motion_col;
+ }
}
static void
@@ -573,7 +578,7 @@ etgl_class_init (ETableGroupLeafClass *klass)
e_group_class->get_focus_column = etgl_get_focus_column;
e_group_class->get_printable = etgl_get_printable;
e_group_class->compute_location = etgl_compute_location;
- e_group_class->compute_mouse_over = etgl_compute_mouse_over;
+ e_group_class->get_mouse_over = etgl_get_mouse_over;
e_group_class->get_cell_geometry = etgl_get_cell_geometry;
g_object_class_install_property (object_class, PROP_TABLE_ALTERNATING_ROW_COLORS,
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index cebef080d8..257d23fb66 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -382,13 +382,13 @@ e_table_group_compute_location (ETableGroup *etg, int *x, int *y, int *row, int
}
void
-e_table_group_compute_mouse_over (ETableGroup *etg, int x, int y, int *row, int *col)
+e_table_group_get_mouse_over (ETableGroup *etg, int *row, int *col)
{
g_return_if_fail (etg != NULL);
g_return_if_fail (E_IS_TABLE_GROUP (etg));
- g_return_if_fail (ETG_CLASS (etg)->compute_mouse_over != NULL);
- ETG_CLASS (etg)->compute_mouse_over (etg, x, y, row, col);
+ g_return_if_fail (ETG_CLASS (etg)->get_mouse_over != NULL);
+ ETG_CLASS (etg)->get_mouse_over (etg, row, col);
}
/**
@@ -648,7 +648,7 @@ etg_class_init (ETableGroupClass *klass)
klass->get_focus = etg_get_focus;
klass->get_printable = NULL;
klass->compute_location = NULL;
- klass->compute_mouse_over = NULL;
+ klass->get_mouse_over = NULL;
klass->get_cell_geometry = NULL;
etg_signals [CURSOR_CHANGE] =
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index 10591e4113..ee225c2471 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -90,7 +90,7 @@ typedef struct {
gint (*get_focus_column) (ETableGroup *etg);
EPrintable *(*get_printable) (ETableGroup *etg);
void (*compute_location) (ETableGroup *etg, int *x, int *y, int *row, int *col);
- void (*compute_mouse_over) (ETableGroup *etg, int x, int y, int *row, int *col);
+ void (*get_mouse_over) (ETableGroup *etg, int *row, int *col);
void (*get_cell_geometry) (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height);
} ETableGroupClass;
@@ -123,9 +123,7 @@ void e_table_group_compute_location (ETableGroup *etg,
int *y,
int *row,
int *col);
-void e_table_group_compute_mouse_over(ETableGroup *etg,
- int x,
- int y,
+void e_table_group_get_mouse_over(ETableGroup *etg,
int *row,
int *col);
void e_table_group_get_cell_geometry (ETableGroup *etg,
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index a7da9e2fe1..6cbab3405e 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -509,10 +509,10 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, int col, gboolean recreate)
rx -= gtk_layout_get_hadjustment (GTK_LAYOUT (GNOME_CANVAS_ITEM (ethi)->canvas))->value;
ry -= gtk_layout_get_vadjustment (GTK_LAYOUT (GNOME_CANVAS_ITEM (ethi)->canvas))->value;
- gtk_widget_set_uposition (arrow_down, rx + x - ARROW_PTR, ry - ARROW_DOWN_HEIGHT);
+ gtk_window_move (GTK_WINDOW (arrow_down), rx + x - ARROW_PTR, ry - ARROW_DOWN_HEIGHT);
gtk_widget_show_all (arrow_down);
- gtk_widget_set_uposition (arrow_up, rx + x - ARROW_PTR, ry + ethi->height);
+ gtk_window_move (GTK_WINDOW (arrow_up), rx + x - ARROW_PTR, ry + ethi->height);
gtk_widget_show_all (arrow_up);
}
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 9e392f4384..69a300d950 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -2416,20 +2416,18 @@ e_table_get_cell_geometry (ETable *table,
/**
* e_table_get_mouse_over_cell:
- * Similar to e_table_get_cell_at, only here we recalculate x,y relatively to each item.
+ * Similar to e_table_get_cell_at, only here we check based on the mouse motion information in the group.
**/
void
-e_table_get_mouse_over_cell (ETable *table, int x, int y, int *row, int *col)
+e_table_get_mouse_over_cell (ETable *table, int *row, int *col)
{
g_return_if_fail (table != NULL);
g_return_if_fail (E_IS_TABLE (table));
- x += GTK_LAYOUT (table->table_canvas)->hadjustment->value;
- y += GTK_LAYOUT (table->table_canvas)->vadjustment->value;
-
- y -= E_TABLE_HEADER_ITEM (table->header_item)->height;
+ if (!table->group)
+ return;
- e_table_group_compute_mouse_over (table->group, x, y, row, col);
+ e_table_group_get_mouse_over (table->group, row, col);
}
/**
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 1a681e9eca..6b2a698d5c 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -282,7 +282,7 @@ void e_table_get_cell_at (ETable *table,
int y,
int *row_return,
int *col_return);
-void e_table_get_mouse_over_cell (ETable *table, int x, int y, int *row, int *col);
+void e_table_get_mouse_over_cell (ETable *table, int *row, int *col);
void e_table_get_cell_geometry (ETable *table,
int row,
int col,
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-05 15:15:22 +0800