g_object_ref (sheet->vaxis);
}
-static const GtkBorder default_cell_padding = { 3, 3, 2, 2 };
+static const GtkBorder default_cell_padding = {3, 3, 3, 3};
static void
psppire_sheet_set_property (GObject *object,
set_entry_widget_font (sheet);
}
-#define BORDER_WIDTH 3
static void
psppire_sheet_realize (GtkWidget *widget)
values.foreground = widget->style->white;
values.function = GDK_INVERT;
values.subwindow_mode = GDK_INCLUDE_INFERIORS;
- values.line_width = BORDER_WIDTH;
+ values.line_width = MAX (sheet->cell_padding->left,
+ MAX (sheet->cell_padding->right,
+ MAX (sheet->cell_padding->top,
+ sheet->cell_padding->bottom)));
sheet->xor_gc = gdk_gc_new_with_values (widget->window,
&values,
GDK_GC_LINE_WIDTH
);
-
gtk_widget_set_parent_window (sheet->entry_widget, sheet->sheet_window);
gtk_widget_set_parent (sheet->entry_widget, GTK_WIDGET (sheet));
gtk_widget_unmap (sheet->entry_widget);
gtk_widget_unmap (sheet->button);
+ gtk_widget_unmap (sheet->hover_window->window);
}
/* get cell attributes of the given cell */
rectangle_from_range (sheet, &new_range, &area);
- gdk_draw_rectangle (sheet->sheet_window,
- sheet->xor_gc,
+ area.width ++;
+ area.height ++;
+
+ gdk_gc_set_clip_rectangle (sheet->xor_gc, &area);
+
+ area.x += sheet->cell_padding->left / 2;
+ area.y += sheet->cell_padding->top / 2;
+ area.width -= (sheet->cell_padding->left + sheet->cell_padding->right ) / 2;
+ area.height -= (sheet->cell_padding->top + sheet->cell_padding->bottom ) / 2;
+
+ gdk_draw_rectangle (sheet->sheet_window, sheet->xor_gc,
FALSE,
- area.x, area.y,
- area.width, area.height);
+ area.x,
+ area.y,
+ area.width,
+ area.height);
+
+ gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL);
}
GdkModifierType mods;
gint x, y;
gint row, column;
- gboolean veto;
+
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (PSPPIRE_IS_SHEET (widget), FALSE);
NULL, NULL, event->time);
gtk_grab_add (GTK_WIDGET (sheet));
- if (sheet->selection_mode != GTK_SELECTION_SINGLE &&
- sheet->selection_mode != GTK_SELECTION_NONE &&
- sheet->cursor_drag->type == GDK_SIZING &&
- !PSPPIRE_SHEET_IN_SELECTION (sheet) && !PSPPIRE_SHEET_IN_RESIZE (sheet))
- {
- if (sheet->state == GTK_STATE_NORMAL)
- {
- row = sheet->active_cell.row;
- column = sheet->active_cell.col;
- sheet->active_cell.row = row;
- sheet->active_cell.col = column;
- sheet->drag_range = sheet->range;
- sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
- psppire_sheet_select_range (sheet, &sheet->drag_range);
- }
- sheet->x_drag = x;
- sheet->y_drag = y;
- if (row > sheet->range.rowi) row--;
- if (column > sheet->range.coli) column--;
- sheet->drag_cell.row = row;
- sheet->drag_cell.col = column;
- sheet->drag_range = sheet->range;
- draw_xor_rectangle (sheet, sheet->drag_range);
- PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_RESIZE);
- }
- else if (sheet->cursor_drag->type == GDK_TOP_LEFT_ARROW &&
- !PSPPIRE_SHEET_IN_SELECTION (sheet)
- && ! PSPPIRE_SHEET_IN_DRAG (sheet)
- && sheet->active_cell.row >= 0
- && sheet->active_cell.col >= 0
- )
- {
- if (sheet->state == GTK_STATE_NORMAL)
- {
- row = sheet->active_cell.row;
- column = sheet->active_cell.col;
- sheet->active_cell.row = row;
- sheet->active_cell.col = column;
- sheet->drag_range = sheet->range;
- sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
- psppire_sheet_select_range (sheet, &sheet->drag_range);
- }
- sheet->x_drag = x;
- sheet->y_drag = y;
- if (row < sheet->range.row0) row++;
- if (row > sheet->range.rowi) row--;
- if (column < sheet->range.col0) column++;
- if (column > sheet->range.coli) column--;
- sheet->drag_cell.row = row;
- sheet->drag_cell.col = column;
- sheet->drag_range = sheet->range;
- draw_xor_rectangle (sheet, sheet->drag_range);
- PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_DRAG);
- }
- else
- {
- veto = psppire_sheet_click_cell (sheet, row, column);
- if (veto) PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
- }
+ if (psppire_sheet_click_cell (sheet, row, column))
+ PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
}
if (event->window == sheet->column_title_window)
if (psppire_sheet_model_get_column_sensitivity (sheet->model, column))
{
- veto = psppire_sheet_click_cell (sheet, -1, column);
gtk_grab_add (GTK_WIDGET (sheet));
PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
}
row = row_from_ypixel (sheet, y);
if (psppire_sheet_model_get_row_sensitivity (sheet->model, row))
{
- veto = psppire_sheet_click_cell (sheet, row, -1);
gtk_grab_add (GTK_WIDGET (sheet));
PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
}
#define HOVER_WINDOW_Y_OFFSET 2
static void
-show_subtitle (PsppireSheet *sheet, gint row, gint column, const gchar *subtitle)
+show_subtitle (PsppireSheet *sheet, gint row, gint column,
+ const gchar *subtitle)
{
gint x, y;
gint px, py;
else if (event->window == sheet->row_title_window)
sheet->row_title_under = event->type == GDK_ENTER_NOTIFY;
+ if (event->type == GDK_LEAVE_NOTIFY)
+ gtk_widget_hide (sheet->hover_window->window);
+
return TRUE;
}
rectangle_from_cell (sheet, sheet->active_cell.row,
sheet->active_cell.col, &entry_alloc);
- entry_alloc.width -= BORDER_WIDTH ;
- entry_alloc.height -= BORDER_WIDTH ;
- entry_alloc.x += DIV_RND_UP (BORDER_WIDTH, 2);
- entry_alloc.y += DIV_RND_UP (BORDER_WIDTH, 2);
+ entry_alloc.x += sheet->cell_padding->left;
+ entry_alloc.y += sheet->cell_padding->right;
+ entry_alloc.width -= sheet->cell_padding->left + sheet->cell_padding->right;
+ entry_alloc.height -= sheet->cell_padding->top + sheet->cell_padding->bottom;
gtk_widget_set_size_request (sheet->entry_widget, entry_alloc.width,