aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--widgets/e-table/ChangeLog19
-rw-r--r--widgets/e-table/Makefile.am2
-rw-r--r--widgets/e-table/TODO12
-rw-r--r--widgets/e-table/e-cell-text.c11
-rw-r--r--widgets/e-table/e-table-header-item.c127
-rw-r--r--widgets/e-table/e-table-header-item.h2
-rw-r--r--widgets/table/e-cell-text.c11
-rw-r--r--widgets/table/e-table-header-item.c127
-rw-r--r--widgets/table/e-table-header-item.h2
9 files changed, 251 insertions, 62 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 621e0607bf..f5bbb8f2a9 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,22 @@
+2000-04-11 Miguel de Icaza <miguel@helixcode.com>
+
+ * e-table-header-item.c (ethi_add_destroy_marker): Add group
+ indent width here.
+ (is_pointer_on_division): Use the group indent here, so the
+ resize pointer is shown at the correct time.
+ (TOLERANCE): Bump it up to 3
+ (draw_button): Do not paint an arrow if there is an icon present,
+ and not enough space to paint.
+
+2000-04-10 Miguel de Icaza <miguel@helixcode.com>
+
+ * e-table-header-item.c (make_shapped_window_from_xpm): New
+ routine, creates a shapped mask window from an xpm buffer.
+ (ethi_add_drop_marker): New version, uses shaped windows instead
+ of canvas items to signal the drop location.
+ (ethi_maybe_start_drag): Disable dragging if there is only one
+ column left.
+
2000-04-10 Miguel de Icaza <miguel@gnu.org>
* e-table-header-item.c (ethi_drag_motion): Drop frozen count
diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am
index 99e4bf154d..b5fa084f1a 100644
--- a/widgets/e-table/Makefile.am
+++ b/widgets/e-table/Makefile.am
@@ -103,6 +103,8 @@ table_example_2_LDADD = \
table_example_2_LDFLAGS = `gnome-config --libs gdk_pixbuf`
icons = \
+ arrow-down.xpm \
+ arrow-up.xpm \
add-col.xpm \
check-empty.xpm \
check-filled.xpm \
diff --git a/widgets/e-table/TODO b/widgets/e-table/TODO
index 43afc73f1e..40e214bc96 100644
--- a/widgets/e-table/TODO
+++ b/widgets/e-table/TODO
@@ -1,8 +1,11 @@
Short Term TODO items:
+Bonobo Issues:
+ 1. DnD does not seem to be working, it always defaults to "destroy column".
+ 2. Cursor location is not propagated (no feedback).
+
Functionality:
-# 1. Remove the internal XML API.
2. Implement GUI grouping.
3. Implement context menu on item-bars.
4. Implement config tool for the view.
@@ -15,9 +18,6 @@ GUI:
4. Use the font from the widget style.
5. Fix the update problems when a group is resized.
-GUI 2:
- 1. Make the insertion points be shaped X windows instead of canvas items.
-
Implement e-cell-height
Implement computation of heights from the e-cell-heights
Make sure we compute the height from that
@@ -47,14 +47,10 @@ mouse grabbing for scrolling
* Add an ETable::get_specification method to get the current layout information.
-+ * Add frozen_columns output.
* Add input and output of column widths and minimum column widths.
+ * Add GUI sort
-+ * Create an ETableSortInfo class.
-+ * Add display of proper arrows to the ETableHeaderItem.
-+ * Add switching of sorting on clicks.
* Add depressed button state to ETableHeaderItem?
* Add GUI grouping
diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c
index 45eec9cb0f..0649392fc6 100644
--- a/widgets/e-table/e-cell-text.c
+++ b/widgets/e-table/e-cell-text.c
@@ -36,7 +36,6 @@
#include <ctype.h>
#include <math.h>
-
/* This defines a line of text */
struct line {
@@ -46,7 +45,6 @@ struct line {
int ellipsis_length; /* Length before adding ellipsis */
};
-
/* Object argument IDs */
enum {
@@ -82,8 +80,6 @@ enum {
static GdkAtom clipboard_atom = GDK_NONE;
-
-
#define PARENT_TYPE e_cell_get_type ()
#define TEXT_PAD 4
@@ -1837,8 +1833,6 @@ calc_line_widths (CurrentCell *cell)
int i;
int j;
-
-
lines = linebreaks->lines;
linebreaks->max_width = 0;
@@ -1892,11 +1886,14 @@ static void
build_current_cell (CurrentCell *cell, ECellTextView *text_view, int model_col, int view_col, int row)
{
ECellView *ecell_view = (ECellView *) text_view;
+
cell->text_view = text_view;
cell->model_col = model_col;
cell->view_col = view_col;
cell->row = row;
cell->breaks = NULL;
cell->text = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
- cell->width = e_table_header_get_column (((ETableItem *)ecell_view->e_table_item_view)->header, view_col)->width - 8;
+ cell->width = e_table_header_get_column (
+ ((ETableItem *)ecell_view->e_table_item_view)->header,
+ view_col)->width - 8;
}
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index 9c76455d73..e558eaa097 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -23,6 +23,11 @@
#include "add-col.xpm"
#include "remove-col.xpm"
+#include "arrow-up.xpm"
+#include "arrow-down.xpm"
+
+#define ARROW_DOWN_HEIGHT 16
+#define ARROW_PTR 7
/* Padding above and below of the string in the header display */
#define PADDING 4
@@ -32,7 +37,7 @@
#define GROUP_INDENT 10
/* Defines the tolerance for proximity of the column division to the cursor position */
-#define TOLERANCE 2
+#define TOLERANCE 3
#define ETHI_RESIZING(x) ((x)->resize_col != -1)
@@ -45,6 +50,11 @@ static GnomeCanvasItemClass *ethi_parent_class;
static void ethi_request_redraw (ETableHeaderItem *ethi);
static void ethi_drop_table_header (ETableHeaderItem *ethi);
+/*
+ * They display the arrows for the drop location.
+ */
+
+static GtkWidget *arrow_up, *arrow_down;
/*
* DnD icons
@@ -73,7 +83,7 @@ static GtkTargetEntry ethi_drop_types [] = {
static void
ethi_destroy (GtkObject *object){
ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (object);
-
+
ethi_drop_table_header (ethi);
if (ethi->sort_info){
@@ -83,7 +93,7 @@ ethi_destroy (GtkObject *object){
gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->group_info_changed_id);
gtk_object_unref (GTK_OBJECT(ethi->sort_info));
}
-
+
if (GTK_OBJECT_CLASS (ethi_parent_class)->destroy)
(*GTK_OBJECT_CLASS (ethi_parent_class)->destroy) (object);
}
@@ -256,12 +266,14 @@ ethi_remove_drop_marker (ETableHeaderItem *ethi)
{
if (ethi->drag_mark == -1)
return;
+
+ gtk_widget_hide (arrow_up);
+ gtk_widget_hide (arrow_down);
ethi->drag_mark = -1;
- gtk_object_destroy (GTK_OBJECT (ethi->drag_mark_item));
- ethi->drag_mark_item = NULL;
}
+#if 0
static void
ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
{
@@ -318,6 +330,67 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
gnome_canvas_points_unref (points);
}
+#endif
+
+static GtkWidget *
+make_shapped_window_from_xpm (const char **xpm)
+{
+ GdkPixbuf *pixbuf;
+ GdkPixmap *pixmap;
+ GdkBitmap *bitmap;
+ GtkWidget *win, *pix;
+
+ pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
+ gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
+ gdk_pixbuf_unref (pixbuf);
+
+ gtk_widget_push_visual (gdk_rgb_get_visual ());
+ gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+ win = gtk_window_new (GTK_WINDOW_POPUP);
+ pix = gtk_pixmap_new (pixmap, bitmap);
+ gtk_widget_realize (win);
+ gtk_container_add (GTK_CONTAINER (win), pix);
+ gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
+ gtk_widget_pop_visual ();
+ gtk_widget_pop_colormap ();
+
+ gdk_pixmap_unref (pixmap);
+ gdk_bitmap_unref (bitmap);
+
+ return win;
+}
+
+static void
+ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
+{
+ int rx, ry;
+ int x, y;
+
+ if (ethi->drag_mark == col)
+ return;
+
+ ethi->drag_mark = col;
+
+ x = e_table_header_col_diff (ethi->eth, 0, col);
+ if (col > 0)
+ x += ethi->group_indent_width;
+
+ if (!arrow_up){
+ arrow_up = make_shapped_window_from_xpm (arrow_up_xpm);
+ arrow_down = make_shapped_window_from_xpm (arrow_down_xpm);
+ }
+
+ gdk_window_get_origin (
+ GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->window,
+ &rx, &ry);
+
+ printf ("Offset: %d, Location: %d\n", x, rx);
+ gtk_widget_set_uposition (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_widget_show_all (arrow_up);
+}
#define gray50_width 2
#define gray50_height 2
@@ -336,6 +409,9 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
ethi->stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
x1 = ethi->x1 + (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
+ if (ethi->drag_col > 0)
+ x1 += ethi->group_indent_width;
+
ethi->remove_item = gnome_canvas_item_new (
GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root),
gnome_canvas_rect_get_type (),
@@ -574,24 +650,31 @@ draw_button (ETableHeaderItem *ethi, ETableCol *col,
col->text, strlen (col->text));
}
+ if (col->pixbuf){
+ if ((gdk_pixbuf_get_width (col->pixbuf) + MIN_ARROW_SIZE + 4) > width)
+ return;
+ }
+
switch (arrow){
case E_TABLE_COL_ARROW_NONE:
break;
+
case E_TABLE_COL_ARROW_UP:
case E_TABLE_COL_ARROW_DOWN:
- gtk_paint_arrow (gtk_widget_get_style (GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas)),
- drawable,
- GTK_STATE_NORMAL,
- GTK_SHADOW_IN,
- &clip,
- GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas),
- "header",
- (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
- TRUE,
- x + PADDING / 2 + clip.width - MIN_ARROW_SIZE - 2,
- y + (ethi->height - MIN_ARROW_SIZE) / 2,
- MIN_ARROW_SIZE,
- MIN_ARROW_SIZE);
+ gtk_paint_arrow (
+ gtk_widget_get_style (GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas)),
+ drawable,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ &clip,
+ GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas),
+ "header",
+ (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
+ TRUE,
+ x + PADDING / 2 + clip.width - MIN_ARROW_SIZE - 2,
+ y + (ethi->height - MIN_ARROW_SIZE) / 2,
+ MIN_ARROW_SIZE,
+ MIN_ARROW_SIZE);
break;
}
}
@@ -692,6 +775,9 @@ is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *re
for (col = 0; col < cols; col++){
ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
+ if (col == 0)
+ total += ethi->group_indent_width;
+
total += ecol->width;
if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)){
@@ -754,6 +840,9 @@ ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event)
if (!ethi->maybe_drag)
return FALSE;
+ if (ethi->eth->col_count < 2)
+ return FALSE;
+
if (MAX (abs (ethi->click_x - event->x),
abs (ethi->click_y - event->y)) <= 3)
return FALSE;
@@ -779,7 +868,6 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
if (ethi->drag_col == -1)
return;
-
if (ethi->sort_info) {
int length = e_table_sort_info_grouping_get_count(ethi->sort_info);
int i;
@@ -851,6 +939,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
break;
case GDK_MOTION_NOTIFY:
+
convert (canvas, e->motion.x, e->motion.y, &x, &y);
if (resizing){
int new_width;
diff --git a/widgets/e-table/e-table-header-item.h b/widgets/e-table/e-table-header-item.h
index 6aeefa885d..40d50efa1a 100644
--- a/widgets/e-table/e-table-header-item.h
+++ b/widgets/e-table/e-table-header-item.h
@@ -49,7 +49,7 @@ typedef struct {
int drag_col, drag_mark;
guint drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id;
guint sort_info_changed_id, group_info_changed_id;
- GnomeCanvasItem *drag_mark_item, *remove_item;
+ GnomeCanvasItem *remove_item;
GdkBitmap *stipple;
/*
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 45eec9cb0f..0649392fc6 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -36,7 +36,6 @@
#include <ctype.h>
#include <math.h>
-
/* This defines a line of text */
struct line {
@@ -46,7 +45,6 @@ struct line {
int ellipsis_length; /* Length before adding ellipsis */
};
-
/* Object argument IDs */
enum {
@@ -82,8 +80,6 @@ enum {
static GdkAtom clipboard_atom = GDK_NONE;
-
-
#define PARENT_TYPE e_cell_get_type ()
#define TEXT_PAD 4
@@ -1837,8 +1833,6 @@ calc_line_widths (CurrentCell *cell)
int i;
int j;
-
-
lines = linebreaks->lines;
linebreaks->max_width = 0;
@@ -1892,11 +1886,14 @@ static void
build_current_cell (CurrentCell *cell, ECellTextView *text_view, int model_col, int view_col, int row)
{
ECellView *ecell_view = (ECellView *) text_view;
+
cell->text_view = text_view;
cell->model_col = model_col;
cell->view_col = view_col;
cell->row = row;
cell->breaks = NULL;
cell->text = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
- cell->width = e_table_header_get_column (((ETableItem *)ecell_view->e_table_item_view)->header, view_col)->width - 8;
+ cell->width = e_table_header_get_column (
+ ((ETableItem *)ecell_view->e_table_item_view)->header,
+ view_col)->width - 8;
}
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 9c76455d73..e558eaa097 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -23,6 +23,11 @@
#include "add-col.xpm"
#include "remove-col.xpm"
+#include "arrow-up.xpm"
+#include "arrow-down.xpm"
+
+#define ARROW_DOWN_HEIGHT 16
+#define ARROW_PTR 7
/* Padding above and below of the string in the header display */
#define PADDING 4
@@ -32,7 +37,7 @@
#define GROUP_INDENT 10
/* Defines the tolerance for proximity of the column division to the cursor position */
-#define TOLERANCE 2
+#define TOLERANCE 3
#define ETHI_RESIZING(x) ((x)->resize_col != -1)
@@ -45,6 +50,11 @@ static GnomeCanvasItemClass *ethi_parent_class;
static void ethi_request_redraw (ETableHeaderItem *ethi);
static void ethi_drop_table_header (ETableHeaderItem *ethi);
+/*
+ * They display the arrows for the drop location.
+ */
+
+static GtkWidget *arrow_up, *arrow_down;
/*
* DnD icons
@@ -73,7 +83,7 @@ static GtkTargetEntry ethi_drop_types [] = {
static void
ethi_destroy (GtkObject *object){
ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (object);
-
+
ethi_drop_table_header (ethi);
if (ethi->sort_info){
@@ -83,7 +93,7 @@ ethi_destroy (GtkObject *object){
gtk_signal_disconnect (GTK_OBJECT(ethi->sort_info), ethi->group_info_changed_id);
gtk_object_unref (GTK_OBJECT(ethi->sort_info));
}
-
+
if (GTK_OBJECT_CLASS (ethi_parent_class)->destroy)
(*GTK_OBJECT_CLASS (ethi_parent_class)->destroy) (object);
}
@@ -256,12 +266,14 @@ ethi_remove_drop_marker (ETableHeaderItem *ethi)
{
if (ethi->drag_mark == -1)
return;
+
+ gtk_widget_hide (arrow_up);
+ gtk_widget_hide (arrow_down);
ethi->drag_mark = -1;
- gtk_object_destroy (GTK_OBJECT (ethi->drag_mark_item));
- ethi->drag_mark_item = NULL;
}
+#if 0
static void
ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
{
@@ -318,6 +330,67 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
gnome_canvas_points_unref (points);
}
+#endif
+
+static GtkWidget *
+make_shapped_window_from_xpm (const char **xpm)
+{
+ GdkPixbuf *pixbuf;
+ GdkPixmap *pixmap;
+ GdkBitmap *bitmap;
+ GtkWidget *win, *pix;
+
+ pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
+ gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
+ gdk_pixbuf_unref (pixbuf);
+
+ gtk_widget_push_visual (gdk_rgb_get_visual ());
+ gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+ win = gtk_window_new (GTK_WINDOW_POPUP);
+ pix = gtk_pixmap_new (pixmap, bitmap);
+ gtk_widget_realize (win);
+ gtk_container_add (GTK_CONTAINER (win), pix);
+ gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
+ gtk_widget_pop_visual ();
+ gtk_widget_pop_colormap ();
+
+ gdk_pixmap_unref (pixmap);
+ gdk_bitmap_unref (bitmap);
+
+ return win;
+}
+
+static void
+ethi_add_drop_marker (ETableHeaderItem *ethi, int col)
+{
+ int rx, ry;
+ int x, y;
+
+ if (ethi->drag_mark == col)
+ return;
+
+ ethi->drag_mark = col;
+
+ x = e_table_header_col_diff (ethi->eth, 0, col);
+ if (col > 0)
+ x += ethi->group_indent_width;
+
+ if (!arrow_up){
+ arrow_up = make_shapped_window_from_xpm (arrow_up_xpm);
+ arrow_down = make_shapped_window_from_xpm (arrow_down_xpm);
+ }
+
+ gdk_window_get_origin (
+ GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->window,
+ &rx, &ry);
+
+ printf ("Offset: %d, Location: %d\n", x, rx);
+ gtk_widget_set_uposition (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_widget_show_all (arrow_up);
+}
#define gray50_width 2
#define gray50_height 2
@@ -336,6 +409,9 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
ethi->stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);
x1 = ethi->x1 + (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
+ if (ethi->drag_col > 0)
+ x1 += ethi->group_indent_width;
+
ethi->remove_item = gnome_canvas_item_new (
GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root),
gnome_canvas_rect_get_type (),
@@ -574,24 +650,31 @@ draw_button (ETableHeaderItem *ethi, ETableCol *col,
col->text, strlen (col->text));
}
+ if (col->pixbuf){
+ if ((gdk_pixbuf_get_width (col->pixbuf) + MIN_ARROW_SIZE + 4) > width)
+ return;
+ }
+
switch (arrow){
case E_TABLE_COL_ARROW_NONE:
break;
+
case E_TABLE_COL_ARROW_UP:
case E_TABLE_COL_ARROW_DOWN:
- gtk_paint_arrow (gtk_widget_get_style (GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas)),
- drawable,
- GTK_STATE_NORMAL,
- GTK_SHADOW_IN,
- &clip,
- GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas),
- "header",
- (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
- TRUE,
- x + PADDING / 2 + clip.width - MIN_ARROW_SIZE - 2,
- y + (ethi->height - MIN_ARROW_SIZE) / 2,
- MIN_ARROW_SIZE,
- MIN_ARROW_SIZE);
+ gtk_paint_arrow (
+ gtk_widget_get_style (GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas)),
+ drawable,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ &clip,
+ GTK_WIDGET(GNOME_CANVAS_ITEM(ethi)->canvas),
+ "header",
+ (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
+ TRUE,
+ x + PADDING / 2 + clip.width - MIN_ARROW_SIZE - 2,
+ y + (ethi->height - MIN_ARROW_SIZE) / 2,
+ MIN_ARROW_SIZE,
+ MIN_ARROW_SIZE);
break;
}
}
@@ -692,6 +775,9 @@ is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *re
for (col = 0; col < cols; col++){
ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
+ if (col == 0)
+ total += ethi->group_indent_width;
+
total += ecol->width;
if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)){
@@ -754,6 +840,9 @@ ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event)
if (!ethi->maybe_drag)
return FALSE;
+ if (ethi->eth->col_count < 2)
+ return FALSE;
+
if (MAX (abs (ethi->click_x - event->x),
abs (ethi->click_y - event->y)) <= 3)
return FALSE;
@@ -779,7 +868,6 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
if (ethi->drag_col == -1)
return;
-
if (ethi->sort_info) {
int length = e_table_sort_info_grouping_get_count(ethi->sort_info);
int i;
@@ -851,6 +939,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
break;
case GDK_MOTION_NOTIFY:
+
convert (canvas, e->motion.x, e->motion.y, &x, &y);
if (resizing){
int new_width;
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 6aeefa885d..40d50efa1a 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -49,7 +49,7 @@ typedef struct {
int drag_col, drag_mark;
guint drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id;
guint sort_info_changed_id, group_info_changed_id;
- GnomeCanvasItem *drag_mark_item, *remove_item;
+ GnomeCanvasItem *remove_item;
GdkBitmap *stipple;
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 18:39:31 +0800