[gnumeric] Canvas: simplify code.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Canvas: simplify code.
- Date: Sat, 16 Jan 2016 22:56:41 +0000 (UTC)
commit 839d3277c8cdcdf1e6b992c962ef85ac59c5711c
Author: Morten Welinder <terra gnome org>
Date: Sat Jan 16 17:56:11 2016 -0500
Canvas: simplify code.
ChangeLog | 2 ++
src/gnm-pane.c | 9 +--------
src/gnumeric-simple-canvas.c | 12 +++---------
src/gnumeric-simple-canvas.h | 3 +--
src/item-bar.c | 6 +-----
src/item-cursor.c | 9 ++-------
src/item-grid.c | 13 +++----------
7 files changed, 13 insertions(+), 41 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6a7d3fd..402ac20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* src/gnumeric-simple-canvas.c (gnm_simple_canvas_ungrab): Drop
unused time argument. All callers changed.
+ (gnm_simple_canvas_grab): Remove unused arguments and return
+ value. All callers changed.
* src/item-bar.c (item_bar_button_pressed): Handle multiple clicks
without regrabbing the focus. See #760639.
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 6787b65..1a4fa1e 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -2597,13 +2597,11 @@ gnm_pane_object_start_resize (GnmPane *pane, int button, guint64 x, gint64 y,
SheetObject *so, int drag_type, gboolean is_creation)
{
GocItem **ctrl_pts;
- GdkEvent *event;
g_return_if_fail (GNM_IS_SO (so));
g_return_if_fail (0 <= drag_type);
g_return_if_fail (drag_type < 9);
- event = goc_canvas_get_cur_event (GOC_CANVAS (pane));
ctrl_pts = g_hash_table_lookup (pane->drag.ctrl_pts, so);
g_return_if_fail (NULL != ctrl_pts);
@@ -2613,11 +2611,7 @@ gnm_pane_object_start_resize (GnmPane *pane, int button, guint64 x, gint64 y,
NULL, NULL, NULL);
return;
}
- gnm_simple_canvas_grab (ctrl_pts[drag_type],
- GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK,
- NULL, gdk_event_get_time (event));
+ gnm_simple_canvas_grab (ctrl_pts[drag_type]);
pane->drag.created_objects = is_creation;
pane->drag.button = button;
pane->drag.last_x = pane->drag.origin_x = x;
@@ -2670,7 +2664,6 @@ static gboolean
control_point_button_released (GocItem *item, int button, G_GNUC_UNUSED double x, G_GNUC_UNUSED double y)
{
GnmPane *pane = GNM_PANE (item->canvas);
- GdkEvent *event = goc_canvas_get_cur_event (item->canvas);
SheetControlGUI *scg = pane->simple.scg;
SheetObject *so;
int idx;
diff --git a/src/gnumeric-simple-canvas.c b/src/gnumeric-simple-canvas.c
index aaeade4..97429d4 100644
--- a/src/gnumeric-simple-canvas.c
+++ b/src/gnumeric-simple-canvas.c
@@ -66,21 +66,15 @@ gnm_simple_canvas_ungrab (GocItem *item)
goc_item_ungrab (item);
}
-/* FIXME this funtion has been simplified a lot, if it really works like that
- we should remove unused args and not return anything except void */
-int
-gnm_simple_canvas_grab (GocItem *item, unsigned int event_mask,
- GdkCursor *cursor, guint32 etime)
+void
+gnm_simple_canvas_grab (GocItem *item)
{
GnmSimpleCanvas *gcanvas = GNM_SIMPLE_CANVAS(item->canvas);
- int res = 0;
- g_return_val_if_fail (gcanvas != NULL, TRUE);
+ g_return_if_fail (gcanvas != NULL);
gcanvas->scg->grab_stack++;
if (debug_canvas_grab)
g_printerr ("Grab inc to %d\n", gcanvas->scg->grab_stack);
goc_item_grab (item);
-
- return res;
}
diff --git a/src/gnumeric-simple-canvas.h b/src/gnumeric-simple-canvas.h
index f1570aa..25f0cdc 100644
--- a/src/gnumeric-simple-canvas.h
+++ b/src/gnumeric-simple-canvas.h
@@ -23,8 +23,7 @@ GType gnm_simple_canvas_get_type (void);
GocCanvas *gnm_simple_canvas_new (SheetControlGUI *scg);
void gnm_simple_canvas_ungrab (GocItem *item);
-int gnm_simple_canvas_grab (GocItem *item, unsigned int event_mask,
- GdkCursor *cursor, guint32 etime);
+void gnm_simple_canvas_grab (GocItem *item);
G_END_DECLS
diff --git a/src/item-bar.c b/src/item-bar.c
index ff6200b..9637942 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -1012,11 +1012,7 @@ item_bar_button_pressed (GocItem *item, int button, double x_, double y_)
ib->start_selection = element;
gnm_pane_slide_init (pane);
}
- gnm_simple_canvas_grab
- (item,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- ib->change_cursor,
- gdk_event_get_time (event));
+ gnm_simple_canvas_grab (item);
return TRUE;
}
diff --git a/src/item-cursor.c b/src/item-cursor.c
index 8791ad2..9724ff2 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -651,7 +651,6 @@ item_cursor_selection_motion (GocItem *item, double x_, double y_)
int style, button;
gint64 x = x_ * canvas->pixels_per_unit, y = y_ * canvas->pixels_per_unit;
GnmItemCursor *special_cursor;
- GdkEvent *event = goc_canvas_get_cur_event (item->canvas);
if (ic->drag_button < 0) {
item_cursor_set_cursor (canvas, ic, x, y);
@@ -714,9 +713,7 @@ item_cursor_selection_motion (GocItem *item, double x_, double y_)
scg_special_cursor_bound_set (ic->scg, &ic->pos);
- gnm_simple_canvas_grab (GOC_ITEM (special_cursor),
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK,
- NULL, gdk_event_get_time (event));
+ gnm_simple_canvas_grab (GOC_ITEM (special_cursor));
gnm_pane_slide_init (pane);
goc_item_bounds_changed (GOC_ITEM (ic));
@@ -1111,9 +1108,7 @@ item_cursor_button_pressed (GocItem *item, int button, double x_, double y_)
ic->drag_button = button;
ic->drag_button_state = bevent->state;
- gnm_simple_canvas_grab (item,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK,
- NULL, gdk_event_get_time (event));
+ gnm_simple_canvas_grab (item);
} else
scg_context_menu (ic->scg, event, FALSE, FALSE);
return TRUE;
diff --git a/src/item-grid.c b/src/item-grid.c
index 5c896ab..1e7f964 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -946,9 +946,7 @@ item_grid_button_pressed (GocItem *item, int button, double x_, double y_)
else
scg_rangesel_bound (scg, pos.col, pos.row, pos.col, pos.row);
gnm_pane_slide_init (pane);
- gnm_simple_canvas_grab (item,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- NULL, gdk_event_get_time (event));
+ gnm_simple_canvas_grab (item);
return TRUE;
}
@@ -959,9 +957,7 @@ item_grid_button_pressed (GocItem *item, int button, double x_, double y_)
scg_rangesel_start (scg, pos.col, pos.row, pos.col, pos.row);
ig->selecting = GNM_ITEM_GRID_SELECTING_FORMULA_RANGE;
gnm_pane_slide_init (pane);
- gnm_simple_canvas_grab (item,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- NULL, gdk_event_get_time (event));
+ gnm_simple_canvas_grab (item);
return TRUE;
}
@@ -1026,9 +1022,7 @@ item_grid_button_pressed (GocItem *item, int button, double x_, double y_)
ig->last_click_time = gdk_event_get_time (event);
ig->selecting = GNM_ITEM_GRID_SELECTING_CELL_RANGE;
gnm_pane_slide_init (pane);
- gnm_simple_canvas_grab (item,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- NULL, gdk_event_get_time (event));
+ gnm_simple_canvas_grab (item);
break;
}
@@ -1148,7 +1142,6 @@ item_grid_button_released (GocItem *item, int button, G_GNUC_UNUSED double x_, G
SheetControlGUI *scg = ig->scg;
Sheet *sheet = scg_sheet (scg);
ItemGridSelectionType selecting = ig->selecting;
- GdkEvent *event = goc_canvas_get_cur_event (item->canvas);
if (button != 1 && button != 2)
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]