#include <gtk/gtktypeutils.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkcontainer.h>
-#include <gtk/gtkpixmap.h>
#include <pango/pango.h>
#include "gtkitementry.h"
#include "gtksheet.h"
static void gtk_sheet_row_title_button_draw (GtkSheet *sheet, gint row);
-static void gtk_sheet_set_row_height (GtkSheet * sheet,
- gint row,
+static void gtk_sheet_set_row_height (GtkSheet *sheet,
+ gint row,
guint height);
static gboolean gtk_sheet_cell_empty (const GtkSheet *, gint, gint);
{
GSheetRow *geo = sheet->row_geometry;
- if (y < 0) return -1;
+ if (y < 0)
+ {
+ g_error ("This shouldnt happen");
+ return -1;
+ }
return g_sheet_row_pixel_to_row (geo, y);
}
}
-
-/* gives the left pixel of the given column in context of
- * the sheet's hoffset */
-static inline gint
-column_left_xpixel (const GtkSheet *sheet, gint ncol)
-{
- return g_sheet_column_start_pixel (sheet->column_geometry, ncol);
-}
-
-
/* returns the column index from a x pixel location */
static inline gint
column_from_xpixel (const GtkSheet *sheet, gint x)
i < g_sheet_column_get_column_count (sheet->column_geometry); i++)
{
if (x >= cx &&
- x <= (cx + g_sheet_column_get_width (sheet->column_geometry, i)) &&
- g_sheet_column_get_visibility (sheet->column_geometry, i))
+ x <= (cx + g_sheet_column_get_width (sheet->column_geometry, i)))
return i;
- if ( g_sheet_column_get_visibility (sheet->column_geometry, i))
- cx += g_sheet_column_get_width (sheet->column_geometry, i);
+
+ cx += g_sheet_column_get_width (sheet->column_geometry, i);
}
/* no match */
ydrag = g_sheet_row_start_pixel (sheet->row_geometry, row) + CELL_SPACING;
if (y <= ydrag + DRAG_WIDTH / 2 && row != 0)
{
- while (!g_sheet_row_get_visibility (sheet->row_geometry, row - 1) && row > 0) row--;
*drag_row = row - 1;
return g_sheet_row_get_sensitivity (sheet->row_geometry, row - 1);
}
*drag_column = column_from_xpixel (sheet, x);
*drag_row = yyy_row_ypixel_to_row (sheet, y);
- if (x >= column_left_xpixel (sheet, sheet->range.col0) - DRAG_WIDTH / 2 &&
- x <= column_left_xpixel (sheet, sheet->range.coli) +
+ if (x >= g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.col0) - DRAG_WIDTH / 2 &&
+ x <= g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.coli) +
g_sheet_column_get_width (sheet->column_geometry, sheet->range.coli) + DRAG_WIDTH / 2)
{
ydrag = g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.row0);
y <= g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.rowi) +
g_sheet_row_get_height (sheet->row_geometry, sheet->range.rowi) + DRAG_WIDTH / 2)
{
- xdrag = column_left_xpixel (sheet, sheet->range.col0);
+ xdrag = g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.col0);
if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2)
{
*drag_column = sheet->range.col0;
return TRUE;
}
- xdrag = column_left_xpixel (sheet, sheet->range.coli) +
+ xdrag = g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.coli) +
g_sheet_column_get_width (sheet->column_geometry, sheet->range.coli);
if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2)
{
sheet->range.col0 < 0 || sheet->range.coli < 0 )
return FALSE;
- xdrag = column_left_xpixel (sheet, sheet->range.coli)+
+ xdrag = g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.coli)+
g_sheet_column_get_width (sheet->column_geometry, sheet->range.coli);
ydrag = g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.rowi) +
ydrag = g_sheet_row_start_pixel (sheet->row_geometry, min_visible_row (sheet));
if (sheet->state == GTK_SHEET_ROW_SELECTED)
- xdrag = column_left_xpixel (sheet, min_visible_column (sheet));
+ xdrag = g_sheet_column_start_pixel (sheet->column_geometry, min_visible_column (sheet));
*drag_column = column_from_xpixel (sheet, x);
*drag_row = yyy_row_ypixel_to_row (sheet, y);
return FALSE;
}
-static void gtk_sheet_class_init (GtkSheetClass * klass);
-static void gtk_sheet_init (GtkSheet * sheet);
-static void gtk_sheet_dispose (GObject * object);
-static void gtk_sheet_finalize (GObject * object);
+
+static gboolean
+rectangle_from_range (GtkSheet *sheet, const GtkSheetRange *range,
+ GdkRectangle *r)
+{
+ g_return_val_if_fail (range, FALSE);
+
+ r->x = g_sheet_column_start_pixel (sheet->column_geometry, range->col0);
+ r->x -= sheet->hadjustment->value;
+
+ if ( sheet->row_titles_visible)
+ r->x += sheet->row_title_area.width;
+
+
+ r->y = g_sheet_row_start_pixel (sheet->row_geometry, range->row0);
+ r->y -= sheet->vadjustment->value;
+
+ if ( sheet->column_titles_visible)
+ r->y += sheet->column_title_area.height;
+
+ r->width = g_sheet_column_start_pixel (sheet->column_geometry, range->coli) -
+ g_sheet_column_start_pixel (sheet->column_geometry, range->col0) +
+ g_sheet_column_get_width (sheet->column_geometry, range->coli);
+
+ r->height = g_sheet_row_start_pixel (sheet->row_geometry, range->rowi) -
+ g_sheet_row_start_pixel (sheet->row_geometry, range->row0) +
+ g_sheet_row_get_height (sheet->row_geometry, range->rowi);
+
+ return TRUE;
+}
+
+static gboolean
+rectangle_from_cell (GtkSheet *sheet, gint row, gint col,
+ GdkRectangle *r)
+{
+ GtkSheetRange range;
+ g_return_val_if_fail (row >= 0, FALSE);
+ g_return_val_if_fail (col >= 0, FALSE);
+
+ range.row0 = range.rowi = row;
+ range.col0 = range.coli = col;
+
+ return rectangle_from_range (sheet, &range, r);
+}
+
+
+static void gtk_sheet_class_init (GtkSheetClass *klass);
+static void gtk_sheet_init (GtkSheet *sheet);
+static void gtk_sheet_dispose (GObject *object);
+static void gtk_sheet_finalize (GObject *object);
static void gtk_sheet_style_set (GtkWidget *widget,
GtkStyle *previous_style);
-static void gtk_sheet_realize (GtkWidget * widget);
-static void gtk_sheet_unrealize (GtkWidget * widget);
-static void gtk_sheet_map (GtkWidget * widget);
-static void gtk_sheet_unmap (GtkWidget * widget);
-static gint gtk_sheet_expose (GtkWidget * widget,
- GdkEventExpose * event);
+static void gtk_sheet_realize (GtkWidget *widget);
+static void gtk_sheet_unrealize (GtkWidget *widget);
+static void gtk_sheet_map (GtkWidget *widget);
+static void gtk_sheet_unmap (GtkWidget *widget);
+static gint gtk_sheet_expose (GtkWidget *widget,
+ GdkEventExpose *event);
static void gtk_sheet_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
-static gint gtk_sheet_button_press (GtkWidget * widget,
- GdkEventButton * event);
-static gint gtk_sheet_button_release (GtkWidget * widget,
- GdkEventButton * event);
-static gint gtk_sheet_motion (GtkWidget * widget,
- GdkEventMotion * event);
+static gint gtk_sheet_button_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gint gtk_sheet_button_release (GtkWidget *widget,
+ GdkEventButton *event);
+static gint gtk_sheet_motion (GtkWidget *widget,
+ GdkEventMotion *event);
static gboolean gtk_sheet_crossing_notify (GtkWidget *widget,
GdkEventCrossing *event);
static gint gtk_sheet_entry_key_press (GtkWidget *widget,
GdkEventKey *key);
static gboolean gtk_sheet_key_press (GtkWidget *widget,
GdkEventKey *key);
-static void gtk_sheet_size_request (GtkWidget * widget,
- GtkRequisition * requisition);
-static void gtk_sheet_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation);
+static void gtk_sheet_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_sheet_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
/* Sheet queries */
-static gboolean gtk_sheet_range_isvisible (const GtkSheet * sheet,
+static gboolean gtk_sheet_range_isvisible (const GtkSheet *sheet,
GtkSheetRange range);
-static gboolean gtk_sheet_cell_isvisible (GtkSheet * sheet,
+static gboolean gtk_sheet_cell_isvisible (GtkSheet *sheet,
gint row, gint column);
/* Drawing Routines */
/* draw cell background and frame */
-static void gtk_sheet_cell_draw_default (GtkSheet *sheet,
+static void gtk_sheet_cell_draw_bg (GtkSheet *sheet,
gint row, gint column);
/* draw cell contents */
gint row, gint column);
/* draw visible part of range. If range == NULL then draw the whole screen */
-static void gtk_sheet_range_draw (GtkSheet *sheet,
- const GtkSheetRange *range);
+static void gtk_sheet_range_draw (GtkSheet *sheet,
+ const GtkSheetRange *range);
/* highlight the visible part of the selected range */
static void gtk_sheet_range_draw_selection (GtkSheet *sheet,
static gboolean gtk_sheet_move_query (GtkSheet *sheet,
gint row, gint column);
-static void gtk_sheet_real_select_range (GtkSheet * sheet,
- const GtkSheetRange * range);
-static void gtk_sheet_real_unselect_range (GtkSheet * sheet,
- const GtkSheetRange * range);
+static void gtk_sheet_real_select_range (GtkSheet *sheet,
+ const GtkSheetRange *range);
+static void gtk_sheet_real_unselect_range (GtkSheet *sheet,
+ const GtkSheetRange *range);
static void gtk_sheet_extend_selection (GtkSheet *sheet,
gint row, gint column);
static void gtk_sheet_new_selection (GtkSheet *sheet,
gint row,
gint column);
-/* Backing Pixmap */
-static void gtk_sheet_make_backing_pixmap (GtkSheet *sheet);
-static void gtk_sheet_draw_backing_pixmap (GtkSheet *sheet,
- GtkSheetRange range);
/* Scrollbars */
-static void adjust_scrollbars (GtkSheet * sheet);
-static void vadjustment_value_changed (GtkAdjustment * adjustment,
+static void adjust_scrollbars (GtkSheet *sheet);
+static void vadjustment_value_changed (GtkAdjustment *adjustment,
gpointer data);
-static void hadjustment_value_changed (GtkAdjustment * adjustment,
+static void hadjustment_value_changed (GtkAdjustment *adjustment,
gpointer data);
-static void draw_xor_vline (GtkSheet * sheet);
-static void draw_xor_hline (GtkSheet * sheet);
+static void draw_xor_vline (GtkSheet *sheet);
+static void draw_xor_hline (GtkSheet *sheet);
static void draw_xor_rectangle (GtkSheet *sheet,
GtkSheetRange range);
-static guint new_column_width (GtkSheet * sheet,
+static guint new_column_width (GtkSheet *sheet,
gint column,
- gint * x);
-static guint new_row_height (GtkSheet * sheet,
+ gint *x);
+static guint new_row_height (GtkSheet *sheet,
gint row,
- gint * y);
+ gint *y);
/* Sheet Button */
static void create_global_button (GtkSheet *sheet);
/* Sheet button gadgets */
-static void size_allocate_column_title_buttons (GtkSheet * sheet);
-static void size_allocate_row_title_buttons (GtkSheet * sheet);
+static void size_allocate_column_title_buttons (GtkSheet *sheet);
+static void size_allocate_row_title_buttons (GtkSheet *sheet);
static void size_allocate_global_button (GtkSheet *sheet);
const GtkSheetButton *button,
GtkRequisition *requisition);
-/* Attributes routines */
-static void init_attributes (const GtkSheet *sheet,
- gint col,
- GtkSheetCellAttr *attributes);
-
-
/* Memory allocation routines */
-static void gtk_sheet_real_range_clear (GtkSheet *sheet,
- const GtkSheetRange *range);
-
static void gtk_sheet_real_cell_clear (GtkSheet *sheet,
gint row,
gint column);
static void
-gtk_sheet_class_init (GtkSheetClass * klass)
+gtk_sheet_class_init (GtkSheetClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
sheet->selection_cell.row = 0;
sheet->selection_cell.col = 0;
- sheet->pixmap = NULL;
-
sheet->range.row0 = 0;
sheet->range.rowi = 0;
sheet->range.col0 = 0;
sheet->state = GTK_SHEET_NORMAL;
sheet->sheet_window = NULL;
- sheet->sheet_window_width = 0;
- sheet->sheet_window_height = 0;
sheet->entry_widget = NULL;
sheet->entry_container = NULL;
sheet->button = NULL;
/* Call back for when the column titles have changed.
FIRST is the first column changed.
- N_COLUMNS is the number of columns which have changed, or - 1, which
- indicates that the column has changed to its right - most extremity
+ N_COLUMNS is the number of columns which have changed, or -1, which
+ indicates that the column has changed to its right-most extremity
*/
static void
column_titles_changed (GtkWidget *w, gint first, gint n_columns, gpointer data)
return g_sheet_column_get_column_count (sheet->column_geometry);
}
-guint
-gtk_sheet_get_rows_count (GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, 0);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
-
- return g_sheet_row_get_row_count (sheet->row_geometry);
-}
-
-void
-gtk_sheet_set_selection_mode (GtkSheet *sheet, gint mode)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- if (GTK_WIDGET_REALIZED (sheet))
- gtk_sheet_real_unselect_range (sheet, NULL);
-
- sheet->selection_mode = mode;
-}
-
static void
-gtk_sheet_set_column_width (GtkSheet * sheet,
+gtk_sheet_set_column_width (GtkSheet *sheet,
gint column,
guint width);
}
}
-
-
-void
-gtk_sheet_set_row_titles_width (GtkSheet *sheet, guint width)
-{
- if (width < COLUMN_MIN_WIDTH) return;
-
- sheet->row_title_area.width = width;
-
- adjust_scrollbars (sheet);
-
- if (sheet->hadjustment)
- g_signal_emit_by_name (sheet->hadjustment,
- "value_changed");
- size_allocate_global_button (sheet);
-}
-
-void
-gtk_sheet_set_column_titles_height (GtkSheet *sheet, guint height)
-{
- if (height < default_row_height (sheet))
- return;
-
- sheet->column_title_area.height = height;
-
- adjust_scrollbars (sheet);
-
- if (sheet->vadjustment)
- g_signal_emit_by_name (sheet->vadjustment,
- "value_changed");
- size_allocate_global_button (sheet);
-}
-
void
gtk_sheet_show_column_titles (GtkSheet *sheet)
{
gfloat col_align)
{
gint x, y;
- guint width, height;
+ gint width, height;
gint adjust;
gint min_row, min_col;
if (column < 0 || column >= g_sheet_column_get_column_count (sheet->column_geometry))
return;
- height = sheet->sheet_window_height;
- width = sheet->sheet_window_width;
+ gdk_drawable_get_size (sheet->sheet_window, &width, &height);
/* adjust vertical scrollbar */
if (row >= 0 && row_align >= 0.0)
{
while (min_row >= 0 && min_row > min_visible_row (sheet))
{
- if (g_sheet_row_get_visibility (sheet->row_geometry, min_row))
- adjust += g_sheet_row_get_height (sheet->row_geometry, min_row);
+ adjust += g_sheet_row_get_height (sheet->row_geometry, min_row);
if (adjust >= height)
{
/* adjust horizontal scrollbar */
if (column >= 0 && col_align >= 0.0)
{
- x = column_left_xpixel (sheet, column)
+ x = g_sheet_column_start_pixel (sheet->column_geometry, column)
- (gint) ( col_align*width + (1.0 - col_align)*
g_sheet_column_get_width (sheet->column_geometry, column));
{
while (min_col >= 0 && min_col > min_visible_column (sheet))
{
- if (g_sheet_column_get_visibility (sheet->column_geometry, min_col))
- adjust += g_sheet_column_get_width (sheet->column_geometry, min_col);
+ adjust += g_sheet_column_get_width (sheet->column_geometry, min_col);
if (adjust >= width)
{
min_col--;
}
min_col = MAX (min_col, 0);
- x = column_left_xpixel (sheet, min_col) +
+ x = g_sheet_column_start_pixel (sheet->column_geometry, min_col) +
g_sheet_column_get_width (sheet->column_geometry, min_col) - 1;
}
}
-void
-gtk_sheet_columns_set_resizable (GtkSheet *sheet, gboolean resizable)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- sheet->columns_resizable = resizable;
-}
-
-gboolean
+static gboolean
gtk_sheet_columns_resizable (GtkSheet *sheet)
{
g_return_val_if_fail (sheet != NULL, FALSE);
}
-void
-gtk_sheet_rows_set_resizable (GtkSheet *sheet, gboolean resizable)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- sheet->rows_resizable = resizable;
-}
-
-gboolean
+static gboolean
gtk_sheet_rows_resizable (GtkSheet *sheet)
{
g_return_val_if_fail (sheet != NULL, FALSE);
void
-gtk_sheet_select_column (GtkSheet * sheet, gint column)
+gtk_sheet_select_column (GtkSheet *sheet, gint column)
{
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
static gboolean
-gtk_sheet_range_isvisible (const GtkSheet * sheet,
+gtk_sheet_range_isvisible (const GtkSheet *sheet,
GtkSheetRange range)
{
g_return_val_if_fail (sheet != NULL, FALSE);
}
static gboolean
-gtk_sheet_cell_isvisible (GtkSheet * sheet,
+gtk_sheet_cell_isvisible (GtkSheet *sheet,
gint row, gint column)
{
GtkSheetRange range;
}
static void
-gtk_sheet_finalize (GObject * object)
+gtk_sheet_finalize (GObject *object)
{
GtkSheet *sheet;
{
GtkSheet *sheet;
GdkWindowAttr attributes;
- gint attributes_mask;
+ const gint attributes_mask =
+ GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR;
+
GdkGCValues values, auxvalues;
GdkColormap *colormap;
GdkDisplay *display;
GDK_LEAVE_NOTIFY_MASK |
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK);
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP |
- GDK_WA_CURSOR;
attributes.cursor = gdk_cursor_new_for_display (display, GDK_TOP_LEFT_ARROW);
attributes.x = 0;
attributes.y = 0;
- attributes.width = sheet->sheet_window_width;
- attributes.height = sheet->sheet_window_height;
sheet->sheet_window = gdk_window_new (widget->window,
&attributes, attributes_mask);
gdk_window_set_background (sheet->sheet_window, &widget->style->white);
gdk_window_show (sheet->sheet_window);
- /* backing_pixmap */
- gtk_sheet_make_backing_pixmap (sheet);
-
/* GCs */
sheet->fg_gc = gdk_gc_new (widget->window);
sheet->bg_gc = gdk_gc_new (widget->window);
-
-
gdk_gc_get_values (sheet->fg_gc, &auxvalues);
values.foreground = widget->style->white;
gdk_window_destroy (sheet->column_title_window);
gdk_window_destroy (sheet->row_title_window);
- if (sheet->pixmap)
- {
- g_object_unref (sheet->pixmap);
- sheet->pixmap = NULL;
- }
-
gtk_widget_unparent (sheet->entry_widget);
if (sheet->button != NULL)
gtk_widget_unparent (sheet->button);
}
static void
-gtk_sheet_map (GtkWidget * widget)
+gtk_sheet_map (GtkWidget *widget)
{
GtkSheet *sheet = GTK_SHEET (widget);
}
static void
-gtk_sheet_unmap (GtkWidget * widget)
+gtk_sheet_unmap (GtkWidget *widget)
{
GtkSheet *sheet = GTK_SHEET (widget);
static void
-gtk_sheet_cell_draw_default (GtkSheet *sheet, gint row, gint col)
+gtk_sheet_cell_draw_bg (GtkSheet *sheet, gint row, gint col)
{
- GdkGC *fg_gc, *bg_gc;
GtkSheetCellAttr attributes;
GdkRectangle area;
g_return_if_fail (sheet != NULL);
- /* bail now if we arn't drawable yet */
+ /* bail now if we aren't yet drawable */
if (!GTK_WIDGET_DRAWABLE (sheet)) return;
- if (row < 0 || row >= g_sheet_row_get_row_count (sheet->row_geometry)) return;
- if (col < 0 || col >= g_sheet_column_get_column_count (sheet->column_geometry)) return;
- if (! g_sheet_column_get_visibility (sheet->column_geometry, col)) return;
- if (! g_sheet_row_get_visibility (sheet->row_geometry, row)) return;
+ if (row < 0 ||
+ row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ return;
+
+ if (col < 0 ||
+ col >= g_sheet_column_get_column_count (sheet->column_geometry))
+ return;
gtk_sheet_get_attributes (sheet, row, col, &attributes);
gdk_gc_set_foreground (sheet->fg_gc, &attributes.foreground);
gdk_gc_set_foreground (sheet->bg_gc, &attributes.background);
- fg_gc = sheet->fg_gc;
- bg_gc = sheet->bg_gc;
-
- area.x = g_sheet_column_start_pixel (sheet->column_geometry, col);
- area.x -= sheet->hadjustment->value;
-
- area.y = g_sheet_row_start_pixel (sheet->row_geometry, row);
- area.y -= sheet->vadjustment->value;
-
- area.width= g_sheet_column_get_width (sheet->column_geometry, col);
- area.height = g_sheet_row_get_height (sheet->row_geometry, row);
+ rectangle_from_cell (sheet, row, col, &area);
gdk_gc_set_line_attributes (sheet->fg_gc, 1, 0, 0, 0);
{
gdk_gc_set_foreground (sheet->bg_gc, &sheet->color[GRID_COLOR]);
- gdk_draw_rectangle (sheet->pixmap,
+ gdk_draw_rectangle (sheet->sheet_window,
sheet->bg_gc,
FALSE,
area.x, area.y,
{
GtkWidget *widget;
GdkRectangle area;
- gint i;
- gint text_width, text_height, y;
- gint xoffset = 0;
- gint size, sizel, sizer;
- GdkGC *fg_gc, *bg_gc;
GtkSheetCellAttr attributes;
PangoLayout *layout;
- PangoRectangle rect;
- PangoRectangle logical_rect;
- PangoLayoutLine *line;
- PangoFontMetrics *metrics;
- PangoContext *context = gtk_widget_get_pango_context (GTK_WIDGET (sheet));
- gint ascent, descent, y_pos;
+ PangoRectangle text;
+ gint font_height;
gchar *label;
g_return_if_fail (sheet != NULL);
- /* bail now if we aren't drawable yet */
if (!GTK_WIDGET_DRAWABLE (sheet))
return;
if (!label)
return;
- if (row < 0 || row >= g_sheet_row_get_row_count (sheet->row_geometry)) return;
- if (col < 0 || col >= g_sheet_column_get_column_count (sheet->column_geometry)) return;
- if (! g_sheet_column_get_visibility (sheet->column_geometry, col)) return;
- if (!g_sheet_row_get_visibility (sheet->row_geometry, row)) return;
+ if (row < 0 || row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ return;
+
+ if (col < 0 ||
+ col >= g_sheet_column_get_column_count (sheet->column_geometry))
+ return;
widget = GTK_WIDGET (sheet);
gdk_gc_set_foreground (sheet->fg_gc, &attributes.foreground);
gdk_gc_set_foreground (sheet->bg_gc, &attributes.background);
- fg_gc = sheet->fg_gc;
- bg_gc = sheet->bg_gc;
-
- area.x = g_sheet_column_start_pixel (sheet->column_geometry, col);
- area.x -= sheet->hadjustment->value;
-
- area.y = g_sheet_row_start_pixel (sheet->row_geometry, row);
- area.y -= sheet->vadjustment->value;
-
- area.width = g_sheet_column_get_width (sheet->column_geometry, col);
- area.height = g_sheet_row_get_height (sheet->row_geometry, row);
-
+ rectangle_from_cell (sheet, row, col, &area);
layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), label);
dispose_string (sheet, label);
pango_layout_set_font_description (layout, attributes.font_desc);
- pango_layout_get_pixel_extents (layout, NULL, &rect);
-
- line = pango_layout_get_lines (layout)->data;
- pango_layout_line_get_extents (line, NULL, &logical_rect);
-
- metrics = pango_context_get_metrics (context,
- attributes.font_desc,
- pango_context_get_language (context));
- ascent = pango_font_metrics_get_ascent (metrics) / PANGO_SCALE;
- descent = pango_font_metrics_get_descent (metrics) / PANGO_SCALE;
+ pango_layout_get_pixel_extents (layout, NULL, &text);
- pango_font_metrics_unref (metrics);
+ gdk_gc_set_clip_rectangle (sheet->fg_gc, &area);
- /* Align primarily for locale's ascent / descent */
+ font_height = pango_font_description_get_size (attributes.font_desc);
+ if ( !pango_font_description_get_size_is_absolute (attributes.font_desc))
+ font_height /= PANGO_SCALE;
- logical_rect.height /= PANGO_SCALE;
- logical_rect.y /= PANGO_SCALE;
- y_pos = area.height - logical_rect.height;
-
- if (logical_rect.height > area.height)
- y_pos = (logical_rect.height - area.height - 2 * COLUMN_TITLES_HEIGHT) / 2;
- else if (y_pos < 0)
- y_pos = 0;
- else if (y_pos + logical_rect.height > area.height)
- y_pos = area.height - logical_rect.height;
-
- text_width = rect.width;
- text_height = rect.height;
- y = area.y + y_pos - COLUMN_TITLES_HEIGHT;
+ /* Centre the text vertically */
+ area.y += (area.height - font_height) / 2.0;
switch (attributes.justification)
{
case GTK_JUSTIFY_RIGHT:
- size = area.width;
- area.x +=area.width;
- {
- for (i = col - 1; i >= min_visible_column (sheet); i--)
- {
- if ( !gtk_sheet_cell_empty (sheet, row, i)) break;
- if (size >= text_width + COLUMN_TITLES_HEIGHT) break;
- size += g_sheet_column_get_width (sheet->column_geometry, i);
- g_sheet_column_set_right_text_column (sheet->column_geometry, i,
- MAX (col,
- g_sheet_column_get_right_text_column (sheet->column_geometry, i)));
- }
- area.width = size;
- }
- area.x -= size;
- xoffset += area.width - text_width - 2 * COLUMN_TITLES_HEIGHT -
- attributes.border.width / 2;
+ area.x += area.width - text.width;
break;
case GTK_JUSTIFY_CENTER:
- sizel = area.width / 2;
- sizer = area.width / 2;
- area.x += area.width / 2;
- {
- for (i = col + 1; i <= max_visible_column (sheet); i++)
- {
- if ( ! gtk_sheet_cell_empty (sheet, row, i)) break;
- if (sizer >= text_width / 2) break;
- sizer += g_sheet_column_get_width (sheet->column_geometry, i);
- g_sheet_column_set_left_text_column (sheet->column_geometry, i,
- MIN (
- col,
- g_sheet_column_get_left_text_column (sheet->column_geometry, i)));
- }
- for (i = col - 1; i >= min_visible_column (sheet); i--)
- {
- if ( ! gtk_sheet_cell_empty (sheet, row, i)) break;
- if (sizel >= text_width / 2) break;
- sizel += g_sheet_column_get_width (sheet->column_geometry, i);
- g_sheet_column_set_right_text_column (sheet->column_geometry, i,
- MAX (col,
- g_sheet_column_get_right_text_column (sheet->column_geometry, i)));
- }
- size = MIN (sizel, sizer);
- }
- area.x -= sizel;
- xoffset += sizel - text_width / 2 - COLUMN_TITLES_HEIGHT;
- area.width = sizel + sizer;
+ area.x += (area.width - text.width) / 2.0;
break;
case GTK_JUSTIFY_LEFT:
+ /* Do nothing */
+ break;
default:
- size = area.width;
- {
- for (i = col + 1; i <= max_visible_column (sheet); i++)
- {
- if (! gtk_sheet_cell_empty (sheet, row, i)) break;
- if (size >= text_width + COLUMN_TITLES_HEIGHT) break;
- size += g_sheet_column_get_width (sheet->column_geometry, i);
- g_sheet_column_set_left_text_column (sheet->column_geometry, i,
- MIN (
- col,
- g_sheet_column_get_left_text_column (sheet->column_geometry, i)));
-
- }
- area.width = size;
- }
- xoffset += attributes.border.width / 2;
+ g_critical ("Unhandled justification %d in column %d\n",
+ attributes.justification, col);
break;
}
- gdk_gc_set_clip_rectangle (fg_gc, &area);
-
-
- gdk_draw_layout (sheet->pixmap, fg_gc,
- area.x + xoffset + COLUMN_TITLES_HEIGHT,
+ gdk_draw_layout (sheet->sheet_window, sheet->fg_gc,
+ area.x,
area.y,
layout);
- gdk_gc_set_clip_rectangle (fg_gc, NULL);
+ gdk_gc_set_clip_rectangle (sheet->fg_gc, NULL);
g_object_unref (layout);
-
}
static void
gtk_sheet_range_draw (GtkSheet *sheet, const GtkSheetRange *range)
{
gint i, j;
+
+ GdkRectangle area;
GtkSheetRange drawing_range;
g_return_if_fail (sheet != NULL);
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
if (!GTK_WIDGET_MAPPED (GTK_WIDGET (sheet))) return;
- if (sheet->sheet_window_width <= 0) return;
- if (sheet->sheet_window_height <=0) return;
-
- if (sheet->pixmap == NULL) return ;
-
if (range == NULL)
{
drawing_range.row0 = min_visible_row (sheet);
drawing_range.rowi = MIN (max_visible_row (sheet),
g_sheet_row_get_row_count (sheet->row_geometry) - 1);
drawing_range.coli = max_visible_column (sheet);
-
- gdk_draw_rectangle (sheet->pixmap,
- GTK_WIDGET (sheet)->style->white_gc,
- TRUE,
- 0, 0,
- sheet->sheet_window_width,
- sheet->sheet_window_height);
+ gdk_drawable_get_size (sheet->sheet_window, &area.width, &area.height);
+ area.x = area.y = 0;
}
else
{
drawing_range.col0 = MAX (range->col0, min_visible_column (sheet));
drawing_range.rowi = MIN (range->rowi, max_visible_row (sheet));
drawing_range.coli = MIN (range->coli, max_visible_column (sheet));
+
+
+ rectangle_from_range (sheet, &drawing_range, &area);
}
+ gdk_draw_rectangle (sheet->sheet_window,
+ GTK_WIDGET (sheet)->style->white_gc,
+ TRUE,
+ area.x, area.y,
+ area.width, area.height);
+
for (i = drawing_range.row0; i <= drawing_range.rowi; i++)
for (j = drawing_range.col0; j <= drawing_range.coli; j++)
{
- gtk_sheet_cell_draw_default (sheet, i, j);
+ gtk_sheet_cell_draw_bg (sheet, i, j);
gtk_sheet_cell_draw_label (sheet, i, j);
}
- gtk_sheet_draw_backing_pixmap (sheet, drawing_range);
-
if (sheet->state != GTK_SHEET_NORMAL &&
gtk_sheet_range_isvisible (sheet, sheet->range))
gtk_sheet_range_draw_selection (sheet, drawing_range);
{
for (j = range.col0; j <= range.coli; j++)
{
-
- if (gtk_sheet_cell_get_state (sheet, i, j) == GTK_STATE_SELECTED &&
- g_sheet_column_get_visibility (sheet->column_geometry, j) && g_sheet_row_get_visibility (sheet->row_geometry, i))
+ if (gtk_sheet_cell_get_state (sheet, i, j) == GTK_STATE_SELECTED)
{
- area.x = column_left_xpixel (sheet, j);
- if ( sheet->row_titles_visible)
- area.x += sheet->row_title_area.width;
-
- area.x -= sheet->hadjustment->value;
-
- area.y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- if ( sheet->column_titles_visible)
- area.y += sheet->column_title_area.height;
-
- area.y -= sheet->vadjustment->value;
-
-
- area.width= g_sheet_column_get_width (sheet->column_geometry, j);
- area.height = g_sheet_row_get_height (sheet->row_geometry, i);
+ rectangle_from_cell (sheet, i, j, &area);
if (i == sheet->range.row0)
{
gtk_sheet_draw_border (sheet, sheet->range);
}
-static void
-gtk_sheet_draw_backing_pixmap (GtkSheet *sheet, GtkSheetRange range)
-{
- gint width, height;
-
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-
- if ( sheet->pixmap == NULL) return;
-
- gdk_drawable_get_size (sheet->pixmap, &width, &height);
-
- gdk_draw_drawable (sheet->sheet_window,
- GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
- sheet->pixmap,
- 0, 0, /* src */
- sheet->row_titles_visible ? sheet->row_title_area.width : 0,
- sheet->column_titles_visible ? sheet->column_title_area.height : 0,
- width, height);
-}
-
static void gtk_sheet_set_cell (GtkSheet *sheet, gint row, gint col,
GtkJustification justification,
const gchar *text);
const gchar *text)
{
GSheetModel *model ;
- gboolean changed ;
+ gboolean changed = FALSE;
gchar *old_text ;
- GtkSheetRange range;
- gint text_width;
- GtkSheetCellAttr attributes;
-
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (col >= g_sheet_column_get_column_count (sheet->column_geometry) || row >= g_sheet_row_get_row_count (sheet->row_geometry)) return;
- if (col < 0 || row < 0) return;
- gtk_sheet_get_attributes (sheet, row, col, &attributes);
+ if (col >= g_sheet_column_get_column_count (sheet->column_geometry)
+ || row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ return;
- attributes.justification = justification;
+ if (col < 0 || row < 0) return;
model = gtk_sheet_get_model (sheet);
old_text = g_sheet_model_get_string (model, row, col);
- changed = FALSE;
-
if (0 != safe_strcmp (old_text, text))
changed = g_sheet_model_set_string (model, text, row, col);
if ( g_sheet_model_free_strings (model))
g_free (old_text);
-
- if (changed && attributes.is_visible)
- {
- gchar *s = gtk_sheet_cell_get_text (sheet, row, col);
- text_width = 0;
- if (s && strlen (s) > 0)
- {
- text_width = STRING_WIDTH (GTK_WIDGET (sheet),
- attributes.font_desc, text);
- }
- dispose_string (sheet, s);
-
- range.row0 = row;
- range.rowi = row;
- range.col0 = min_visible_column (sheet);
- range.coli = max_visible_column (sheet);
-
- gtk_sheet_range_draw (sheet, &range);
- }
-
if ( changed )
g_signal_emit (sheet, sheet_signals[CHANGED], 0, row, col);
-
}
dispose_string (sheet, old_text);
}
-void
-gtk_sheet_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- gtk_sheet_real_range_clear (sheet, range);
-}
-
-static void
-gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
-{
- gint i, j;
- GtkSheetRange clear;
-
- if (!range)
- {
- clear.row0 = 0;
- clear.rowi = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
- clear.col0 = 0;
- clear.coli = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
- }
- else
- clear=*range;
-
- clear.row0 = MAX (clear.row0, 0);
- clear.col0 = MAX (clear.col0, 0);
- clear.rowi = MIN (clear.rowi, g_sheet_row_get_row_count (sheet->row_geometry) - 1 );
- clear.coli = MIN (clear.coli, g_sheet_column_get_column_count (sheet->column_geometry) - 1 );
-
- for (i = clear.row0; i <= clear.rowi; i++)
- for (j = clear.col0; j <= clear.coli; j++)
- {
- gtk_sheet_real_cell_clear (sheet, i, j);
- }
-
- gtk_sheet_range_draw (sheet, NULL);
-}
static gboolean
y += sheet->vadjustment->value;
- trow = yyy_row_ypixel_to_row (sheet, y);
- if (trow > g_sheet_row_get_row_count (sheet->row_geometry))
- return FALSE;
+ if ( y < 0 && sheet->column_titles_visible)
+ {
+ trow = -1;
+ }
+ else
+ {
+ trow = yyy_row_ypixel_to_row (sheet, y);
+ if (trow > g_sheet_row_get_row_count (sheet->row_geometry))
+ return FALSE;
+ }
*row = trow;
x += sheet->hadjustment->value;
- tcol = column_from_xpixel (sheet, x);
- if (tcol > g_sheet_column_get_column_count (sheet->column_geometry))
- return FALSE;
+ if ( x < 0 && sheet->row_titles_visible)
+ {
+ tcol = -1;
+ }
+ else
+ {
+ tcol = column_from_xpixel (sheet, x);
+ if (tcol > g_sheet_column_get_column_count (sheet->column_geometry))
+ return FALSE;
+ }
*column = tcol;
}
gboolean
-gtk_sheet_get_cell_area (GtkSheet * sheet,
+gtk_sheet_get_cell_area (GtkSheet *sheet,
gint row,
gint column,
GdkRectangle *area)
if (row >= g_sheet_row_get_row_count (sheet->row_geometry) || column >= g_sheet_column_get_column_count (sheet->column_geometry))
return FALSE;
- area->x = (column == -1) ? 0 : column_left_xpixel (sheet, column);
+ area->x = (column == -1) ? 0 : g_sheet_column_start_pixel (sheet->column_geometry, column);
area->y = (row == -1) ? 0 : g_sheet_row_start_pixel (sheet->row_geometry, row);
area->width= (column == -1) ? sheet->row_title_area.width
}
gboolean
-gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint column)
+gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint col)
{
g_return_val_if_fail (sheet != NULL, 0);
g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
- if (row < - 1 || column < - 1) return FALSE;
- if (row >= g_sheet_row_get_row_count (sheet->row_geometry) || column >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (row < -1 || col < -1) return FALSE;
+ if (row >= g_sheet_row_get_row_count (sheet->row_geometry)
+ ||
+ col >= g_sheet_column_get_column_count (sheet->column_geometry))
return FALSE;
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
- gtk_sheet_deactivate_cell (sheet);
-
sheet->active_cell.row = row;
- sheet->active_cell.col = column;
+ sheet->active_cell.col = col;
+
+ if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return TRUE;
+
+ gtk_sheet_deactivate_cell (sheet);
- if ( row == -1 || column == -1)
+ if ( row == -1 || col == -1)
{
gtk_sheet_hide_active_cell (sheet);
return TRUE;
}
- if (!gtk_sheet_activate_cell (sheet, row, column)) return FALSE;
-
-
- return TRUE;
+ return gtk_sheet_activate_cell (sheet, row, col);
}
void
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return ;
if (sheet->state != GTK_SHEET_NORMAL) return ;
+
if ( sheet->active_cell.row == -1 || sheet->active_cell.col == -1 )
return ;
+ /*
+ g_print ("%s\n", __FUNCTION__);
+
+
+ GtkSheetRange r;
+ r.col0 = r.coli = sheet->active_cell.col;
+ r.row0 = r.rowi = sheet->active_cell.row;
+ gtk_sheet_range_draw (sheet, &r);
+ */
+
+
g_signal_emit (sheet, sheet_signals[DEACTIVATE], 0,
sheet->active_cell.row,
sheet->active_cell.col);
sheet->active_cell.row = -1;
sheet->active_cell.col = -1;
+#if 0
if (GTK_SHEET_REDRAW_PENDING (sheet))
{
GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_REDRAW_PENDING);
gtk_sheet_range_draw (sheet, NULL);
}
+#endif
}
+
+
static void
gtk_sheet_hide_active_cell (GtkSheet *sheet)
{
- const char *text;
- gint row, col;
- GtkJustification justification;
- GtkSheetCellAttr attributes;
-
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
+ GdkRectangle area;
- row = sheet->active_cell.row;
- col = sheet->active_cell.col;
+ if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return;
- if (row < 0 || col < 0) return;
+ if (sheet->active_cell.row < 0 ||
+ sheet->active_cell.col < 0) return;
- text = gtk_entry_get_text (GTK_ENTRY (gtk_sheet_get_entry (sheet)));
+ gtk_widget_hide (sheet->entry_widget);
+ gtk_widget_unmap (sheet->entry_widget);
- gtk_sheet_get_attributes (sheet, row, col, &attributes);
- justification = attributes.justification;
+ rectangle_from_cell (sheet,
+ sheet->active_cell.row, sheet->active_cell.col,
+ &area);
- row = sheet->active_cell.row;
- col = sheet->active_cell.col;
+ gdk_draw_rectangle (sheet->sheet_window,
+ GTK_WIDGET (sheet)->style->white_gc,
+ TRUE,
+ area.x, area.y,
+ area.width, area.height);
- gtk_widget_hide (sheet->entry_widget);
- gtk_widget_unmap (sheet->entry_widget);
+ gtk_sheet_cell_draw_bg (sheet, sheet->active_cell.row,
+ sheet->active_cell.col);
- gtk_widget_grab_focus (GTK_WIDGET (sheet));
+ gtk_sheet_cell_draw_label (sheet, sheet->active_cell.row,
+ sheet->active_cell.col);
GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE);
}
if (row < 0 || col < 0) return FALSE;
- if ( row > g_sheet_row_get_row_count (sheet->row_geometry) || col > g_sheet_column_get_column_count (sheet->column_geometry))
+ if ( row > g_sheet_row_get_row_count (sheet->row_geometry)
+ || col > g_sheet_column_get_column_count (sheet->column_geometry))
return FALSE;
if (!veto) return FALSE;
GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-
gtk_sheet_show_active_cell (sheet);
g_signal_connect (gtk_sheet_get_entry (sheet),
if (row < 0 || col < 0) return;
- if (!gtk_sheet_cell_isvisible (sheet, row, col)) return;
+ if (!gtk_sheet_cell_isvisible (sheet, row, col))
+ return;
range.col0 = range.coli = col;
range.row0 = range.rowi = row;
-static void
-gtk_sheet_make_backing_pixmap (GtkSheet *sheet)
-{
- gint pixmap_width, pixmap_height;
- gint width, height;
-
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-
- width = sheet->sheet_window_width ;
- height = sheet->sheet_window_height ;
-
-
- if ( width <= 0) return;
- if ( height <= 0) return;
-
- if (!sheet->pixmap)
- {
- /* allocate */
- sheet->pixmap = gdk_pixmap_new (sheet->sheet_window,
- width, height,
- - 1);
-
- gtk_sheet_range_draw (sheet, NULL);
- }
- else
- {
- /* reallocate if sizes don't match */
- gdk_drawable_get_size (sheet->pixmap,
- &pixmap_width, &pixmap_height);
- if ( (pixmap_width != width) || (pixmap_height != height))
- {
- g_object_unref (sheet->pixmap);
- sheet->pixmap = gdk_pixmap_new (sheet->sheet_window,
- width, height,
- - 1);
- gtk_sheet_range_draw (sheet, NULL);
- }
- }
-}
-
static void
gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range)
{
j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
if (state == GTK_STATE_SELECTED && selected &&
- g_sheet_column_get_visibility (sheet->column_geometry, j) && g_sheet_row_get_visibility (sheet->row_geometry, i) &&
(i == sheet->range.row0 || i == sheet->range.rowi ||
j == sheet->range.col0 || j == sheet->range.coli ||
i == new_range.row0 || i == new_range.rowi ||
if (mask1 != mask2)
{
- x = column_left_xpixel (sheet, j);
+ x = g_sheet_column_start_pixel (sheet->column_geometry, j);
y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = column_left_xpixel (sheet, j)- x+
+ width = g_sheet_column_start_pixel (sheet->column_geometry, j)- x+
g_sheet_column_get_width (sheet->column_geometry, j);
height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
if (i != sheet->active_cell.row || j != sheet->active_cell.col)
{
- x = column_left_xpixel (sheet, j);
+ x = g_sheet_column_start_pixel (sheet->column_geometry, j);
y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = column_left_xpixel (sheet, j)- x+
+ width = g_sheet_column_start_pixel (sheet->column_geometry, j)- x+
g_sheet_column_get_width (sheet->column_geometry, j);
height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
selected= (i <= new_range.rowi && i >= new_range.row0 &&
j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
- if (state == GTK_STATE_SELECTED && !selected &&
- g_sheet_column_get_visibility (sheet->column_geometry, j) && g_sheet_row_get_visibility (sheet->row_geometry, i))
+ if (state == GTK_STATE_SELECTED && !selected)
{
- x = column_left_xpixel (sheet, j);
+ x = g_sheet_column_start_pixel (sheet->column_geometry, j);
y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = column_left_xpixel (sheet, j) - x + g_sheet_column_get_width (sheet->column_geometry, j);
+ width = g_sheet_column_start_pixel (sheet->column_geometry, j) - x + g_sheet_column_get_width (sheet->column_geometry, j);
height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
if (i == sheet->range.row0)
j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
if (state != GTK_STATE_SELECTED && selected &&
- g_sheet_column_get_visibility (sheet->column_geometry, j) && g_sheet_row_get_visibility (sheet->row_geometry, i) &&
(i != sheet->active_cell.row || j != sheet->active_cell.col))
{
- x = column_left_xpixel (sheet, j);
+ x = g_sheet_column_start_pixel (sheet->column_geometry, j);
y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = column_left_xpixel (sheet, j) - x + g_sheet_column_get_width (sheet->column_geometry, j);
+ width = g_sheet_column_start_pixel (sheet->column_geometry, j) - x + g_sheet_column_get_width (sheet->column_geometry, j);
height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
if (i == new_range.row0)
{
for (j = aux_range.col0; j <= aux_range.coli; j++)
{
+ state = gtk_sheet_cell_get_state (sheet, i, j);
- if (g_sheet_column_get_visibility (sheet->column_geometry, j) && g_sheet_row_get_visibility (sheet->row_geometry, i))
- {
-
- state = gtk_sheet_cell_get_state (sheet, i, j);
-
- mask1 = i == sheet->range.row0 ? 1 : 0;
- mask1 = i == sheet->range.rowi ? mask1 + 2 : mask1;
- mask1 = j == sheet->range.col0 ? mask1 + 4 : mask1;
- mask1 = j == sheet->range.coli ? mask1 + 8 : mask1;
-
- mask2 = i == new_range.row0 ? 1 : 0;
- mask2 = i == new_range.rowi ? mask2 + 2 : mask2;
- mask2 = j == new_range.col0 ? mask2 + 4 : mask2;
- mask2 = j == new_range.coli ? mask2 + 8 : mask2;
- if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
- {
- x = column_left_xpixel (sheet, j);
- y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = g_sheet_column_get_width (sheet->column_geometry, j);
- height = g_sheet_row_get_height (sheet->row_geometry, i);
- if (mask2 & 1)
- gdk_draw_rectangle (sheet->sheet_window,
- sheet->xor_gc,
- TRUE,
- x + 1, y - 1,
- width, 3);
-
-
- if (mask2 & 2)
- gdk_draw_rectangle (sheet->sheet_window,
- sheet->xor_gc,
- TRUE,
- x + 1, y + height - 1,
- width, 3);
-
- if (mask2 & 4)
- gdk_draw_rectangle (sheet->sheet_window,
- sheet->xor_gc,
- TRUE,
- x - 1, y + 1,
- 3, height);
-
-
- if (mask2 & 8)
- gdk_draw_rectangle (sheet->sheet_window,
- sheet->xor_gc,
- TRUE,
- x + width - 1, y + 1,
- 3, height);
-
-
-
- }
+ mask1 = i == sheet->range.row0 ? 1 : 0;
+ mask1 = i == sheet->range.rowi ? mask1 + 2 : mask1;
+ mask1 = j == sheet->range.col0 ? mask1 + 4 : mask1;
+ mask1 = j == sheet->range.coli ? mask1 + 8 : mask1;
+ mask2 = i == new_range.row0 ? 1 : 0;
+ mask2 = i == new_range.rowi ? mask2 + 2 : mask2;
+ mask2 = j == new_range.col0 ? mask2 + 4 : mask2;
+ mask2 = j == new_range.coli ? mask2 + 8 : mask2;
+ if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
+ {
+ x = g_sheet_column_start_pixel (sheet->column_geometry, j);
+ y = g_sheet_row_start_pixel (sheet->row_geometry, i);
+ width = g_sheet_column_get_width (sheet->column_geometry, j);
+ height = g_sheet_row_get_height (sheet->row_geometry, i);
+ if (mask2 & 1)
+ gdk_draw_rectangle (sheet->sheet_window,
+ sheet->xor_gc,
+ TRUE,
+ x + 1, y - 1,
+ width, 3);
+
+
+ if (mask2 & 2)
+ gdk_draw_rectangle (sheet->sheet_window,
+ sheet->xor_gc,
+ TRUE,
+ x + 1, y + height - 1,
+ width, 3);
+
+ if (mask2 & 4)
+ gdk_draw_rectangle (sheet->sheet_window,
+ sheet->xor_gc,
+ TRUE,
+ x - 1, y + 1,
+ 3, height);
+
+
+ if (mask2 & 8)
+ gdk_draw_rectangle (sheet->sheet_window,
+ sheet->xor_gc,
+ TRUE,
+ x + width - 1, y + 1,
+ 3, height);
}
-
}
}
-
*range = new_range;
}
gtk_sheet_draw_border (GtkSheet *sheet, GtkSheetRange new_range)
{
GdkRectangle area;
- gint width, height;
- gint x = column_left_xpixel (sheet, new_range.col0);
- gint y = g_sheet_row_start_pixel (sheet->row_geometry, new_range.row0);
-
- if ( sheet->row_titles_visible)
- x += sheet->row_title_area.width;
-
- x -= sheet->hadjustment->value;
-
- if ( sheet->column_titles_visible)
- y += sheet->column_title_area.height;
-
- y -= sheet->vadjustment->value;
-
- width = column_left_xpixel (sheet, new_range.coli) -
- column_left_xpixel (sheet, new_range.col0)
- +
- g_sheet_column_get_width (sheet->column_geometry, new_range.coli);
-
- height = g_sheet_row_start_pixel (sheet->row_geometry, new_range.rowi) -
- g_sheet_row_start_pixel (sheet->row_geometry, new_range.row0)
- +
- g_sheet_row_get_height (sheet->row_geometry, new_range.rowi);
-
- area.x = column_left_xpixel (sheet, min_visible_column (sheet));
- if ( sheet->row_titles_visible)
- area.x += sheet->row_title_area.width;
-
- area.x -= sheet->hadjustment->value;
-
- area.y = g_sheet_row_start_pixel (sheet->row_geometry, min_visible_row (sheet));
- if ( sheet->column_titles_visible)
- area.y += sheet->column_title_area.height;
-
- area.y -= sheet->vadjustment->value;
-
-
- area.width = sheet->sheet_window_width;
- area.height = sheet->sheet_window_height;
-
- gdk_gc_set_clip_rectangle (sheet->xor_gc, &area);
+ rectangle_from_range (sheet, &new_range, &area);
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
FALSE,
- x, y,
- width - 2,
- height - 2);
-
- gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL);
+ area.x + 1,
+ area.y + 1,
+ area.width - 2,
+ area.height - 2);
}
static void
-gtk_sheet_real_select_range (GtkSheet * sheet,
- const GtkSheetRange * range)
+gtk_sheet_real_select_range (GtkSheet *sheet,
+ const GtkSheetRange *range)
{
gint state;
state = sheet->state;
+#if 0
if (range->coli != sheet->range.coli || range->col0 != sheet->range.col0 ||
range->rowi != sheet->range.rowi || range->row0 != sheet->range.row0)
{
}
else
{
- gtk_sheet_draw_backing_pixmap (sheet, sheet->range);
gtk_sheet_range_draw_selection (sheet, sheet->range);
}
+#endif
gtk_sheet_update_primary_selection (sheet);
void
-gtk_sheet_select_range (GtkSheet * sheet, const GtkSheetRange *range)
+gtk_sheet_select_range (GtkSheet *sheet, const GtkSheetRange *range)
{
g_return_if_fail (sheet != NULL);
}
void
-gtk_sheet_unselect_range (GtkSheet * sheet)
+gtk_sheet_unselect_range (GtkSheet *sheet)
{
if (! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
return;
static void
-gtk_sheet_real_unselect_range (GtkSheet * sheet,
+gtk_sheet_real_unselect_range (GtkSheet *sheet,
const GtkSheetRange *range)
{
g_return_if_fail (sheet != NULL);
g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, -1);
g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, -1);
+#if 0
if (gtk_sheet_range_isvisible (sheet, *range))
gtk_sheet_draw_backing_pixmap (sheet, *range);
+#endif
sheet->range.row0 = -1;
sheet->range.rowi = -1;
static gint
-gtk_sheet_expose (GtkWidget * widget,
- GdkEventExpose * event)
+gtk_sheet_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
GtkSheet *sheet;
GtkSheetRange range;
sheet = GTK_SHEET (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ if (!GTK_WIDGET_DRAWABLE (widget))
+ return FALSE;
+
+ /* exposure events on the sheet */
+ if (event->window == sheet->row_title_window &&
+ sheet->row_titles_visible)
{
- range.row0 = yyy_row_ypixel_to_row (sheet, event->area.y);
- range.col0 = column_from_xpixel (sheet, event->area.x);
- range.rowi = yyy_row_ypixel_to_row (sheet,
- event->area.y + event->area.height);
+ gint i;
+ for (i = min_visible_row (sheet); i <= max_visible_row (sheet); i++)
+ gtk_sheet_row_title_button_draw (sheet, i);
+ }
- range.coli = column_from_xpixel (sheet,
- event->area.x + event->area.width);
+ if (event->window == sheet->column_title_window &&
+ sheet->column_titles_visible)
+ {
+ gint i;
+ for (i = min_visible_column (sheet);
+ i <= max_visible_column (sheet);
+ ++i)
+ gtk_sheet_column_title_button_draw (sheet, i);
+ }
- /* exposure events on the sheet */
- if (event->window == sheet->row_title_window &&
- sheet->row_titles_visible)
- {
- gint i;
- for (i = min_visible_row (sheet); i <= max_visible_row (sheet); i++)
- gtk_sheet_row_title_button_draw (sheet, i);
- }
- if (event->window == sheet->column_title_window &&
- sheet->column_titles_visible)
- {
- gint i;
- for (i = min_visible_column (sheet);
- i <= max_visible_column (sheet);
- ++i)
- gtk_sheet_column_title_button_draw (sheet, i);
- }
+ range.row0 =
+ yyy_row_ypixel_to_row (sheet,
+ event->area.y + sheet->vadjustment->value);
+ range.row0--;
+
+ range.rowi =
+ yyy_row_ypixel_to_row (sheet,
+ event->area.y +
+ event->area.height + sheet->vadjustment->value);
+ range.rowi++;
+
+ range.col0 =
+ column_from_xpixel (sheet,
+ event->area.x + sheet->hadjustment->value);
+ range.col0--;
+
+ range.coli =
+ column_from_xpixel (sheet,
+ event->area.x + event->area.width +
+ sheet->hadjustment->value);
+ range.coli++;
+
+ if (event->window == sheet->sheet_window)
+ {
+ gtk_sheet_range_draw (sheet, &range);
- if (event->window == sheet->sheet_window)
+ if (sheet->state != GTK_SHEET_NORMAL)
{
- gtk_sheet_draw_backing_pixmap (sheet, range);
+ if (gtk_sheet_range_isvisible (sheet, sheet->range))
+ gtk_sheet_range_draw (sheet, &sheet->range);
- if (sheet->state != GTK_SHEET_NORMAL)
- {
- if (gtk_sheet_range_isvisible (sheet, sheet->range))
- gtk_sheet_draw_backing_pixmap (sheet, sheet->range);
- if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
- gtk_sheet_draw_backing_pixmap (sheet, sheet->drag_range);
-
- if (gtk_sheet_range_isvisible (sheet, sheet->range))
- gtk_sheet_range_draw_selection (sheet, sheet->range);
- if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
- draw_xor_rectangle (sheet, sheet->drag_range);
- }
+ if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
+ gtk_sheet_range_draw (sheet, &sheet->drag_range);
- if ((!GTK_SHEET_IN_XDRAG (sheet)) && (!GTK_SHEET_IN_YDRAG (sheet)))
- {
- if (sheet->state == GTK_SHEET_NORMAL)
- gtk_sheet_draw_active_cell (sheet);
- }
+ if (gtk_sheet_range_isvisible (sheet, sheet->range))
+ gtk_sheet_range_draw_selection (sheet, sheet->range);
+ if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
+ draw_xor_rectangle (sheet, sheet->drag_range);
+ }
+
+ if ((!GTK_SHEET_IN_XDRAG (sheet)) && (!GTK_SHEET_IN_YDRAG (sheet)))
+ {
+ if (sheet->state == GTK_SHEET_NORMAL)
+ gtk_sheet_draw_active_cell (sheet);
}
}
static gboolean
-gtk_sheet_button_press (GtkWidget * widget,
- GdkEventButton * event)
+gtk_sheet_button_press (GtkWidget *widget,
+ GdkEventButton *event)
{
GtkSheet *sheet;
GdkModifierType mods;
- gint x, y, row, column;
+ gint x, y;
+ gint row, column;
gboolean veto;
g_return_val_if_fail (widget != NULL, FALSE);
return FALSE;
}
- if (column >= 0 && row >= 0)
- {
- if (! g_sheet_column_get_visibility (sheet->column_geometry, column)
- || !g_sheet_row_get_visibility (sheet->row_geometry, row))
- {
- return FALSE;
- }
- }
-
g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
sheet->active_cell.row, sheet->active_cell.col,
&row, &column, &forbid_move);
return TRUE;
}
- if (row == - 1 && column == - 1)
+ if (row == -1 && column == -1)
{
sheet->range.row0 = 0;
sheet->range.col0 = 0;
return TRUE;
}
- if (row != -1 && column != -1)
+ if (sheet->state != GTK_SHEET_NORMAL)
{
- if (sheet->state != GTK_SHEET_NORMAL)
- {
- sheet->state = GTK_SHEET_NORMAL;
- gtk_sheet_real_unselect_range (sheet, NULL);
- }
- else
- {
- gtk_sheet_deactivate_cell (sheet);
- gtk_sheet_activate_cell (sheet, row, column);
- }
-
- sheet->active_cell.row = row;
- sheet->active_cell.col = column;
- sheet->selection_cell.row = row;
- sheet->selection_cell.col = column;
- sheet->range.row0 = row;
- sheet->range.col0 = column;
- sheet->range.rowi = row;
- sheet->range.coli = column;
sheet->state = GTK_SHEET_NORMAL;
- GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
- gtk_sheet_draw_active_cell (sheet);
- return TRUE;
+ gtk_sheet_real_unselect_range (sheet, NULL);
+ }
+ else
+ {
+ gtk_sheet_deactivate_cell (sheet);
+ gtk_sheet_activate_cell (sheet, row, column);
}
- g_assert_not_reached ();
+ sheet->active_cell.row = row;
+ sheet->active_cell.col = column;
+ sheet->selection_cell.row = row;
+ sheet->selection_cell.col = column;
+ sheet->range.row0 = row;
+ sheet->range.col0 = column;
+ sheet->range.rowi = row;
+ sheet->range.coli = column;
+ sheet->state = GTK_SHEET_NORMAL;
+ GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
+ gtk_sheet_draw_active_cell (sheet);
+ return TRUE;
}
static gint
\f
+
/* Shamelessly lifted from gtktooltips */
static gboolean
gtk_sheet_subtitle_paint_window (GtkWidget *tip_window)
text = g_sheet_column_get_subtitle (col_geo, column);
- show_subtitle (sheet, -1, column, text );
+ show_subtitle (sheet, -1, column, text);
g_free (text);
}
if ( gtk_sheet_get_pixel_info (sheet, wx, wy, &row, &column) )
{
- if ( row != sheet->hover_window->row || column != sheet->hover_window->column)
+ if ( row != sheet->hover_window->row ||
+ column != sheet->hover_window->column)
{
gtk_widget_hide (sheet->hover_window->window);
}
GtkSheetRange aux;
gint v_h, current_col, current_row, col_threshold, row_threshold;
v_h = 1;
- if (abs (x - column_left_xpixel (sheet, sheet->drag_cell.col)) >
+ if (abs (x - g_sheet_column_start_pixel (sheet->column_geometry, sheet->drag_cell.col)) >
abs (y - g_sheet_row_start_pixel (sheet->row_geometry, sheet->drag_cell.row))) v_h = 2;
current_col = column_from_xpixel (sheet, x);
/*use half of column width resp. row height as threshold to
expand selection*/
- col_threshold = column_left_xpixel (sheet, current_col) +
+ col_threshold = g_sheet_column_start_pixel (sheet->column_geometry, current_col) +
g_sheet_column_get_width (sheet->column_geometry, current_col) / 2;
if (column > 0)
{
static gboolean
gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column)
{
- guint height, width;
+ gint height, width;
gint new_row = row;
gint new_col = column;
gfloat row_align = -1.0;
gfloat col_align = -1.0;
- height = sheet->sheet_window_height;
- width = sheet->sheet_window_width;
+ if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return FALSE;
+
+ gdk_drawable_get_size (sheet->sheet_window, &width, &height);
- if (row >= max_visible_row (sheet) && sheet->state != GTK_SHEET_COLUMN_SELECTED)
+ if (row >= max_visible_row (sheet) &&
+ sheet->state != GTK_SHEET_COLUMN_SELECTED)
{
row_align = 1.;
new_row = MIN (g_sheet_row_get_row_count (sheet->row_geometry) - 1, row + 1);
row_align = -1.;
}
}
+
if (row < min_visible_row (sheet) && sheet->state != GTK_SHEET_COLUMN_SELECTED)
{
row_align= 0.;
new_col = MIN (g_sheet_column_get_column_count (sheet->column_geometry) - 1, column + 1);
column_move = TRUE;
if (max_visible_column (sheet) == (g_sheet_column_get_column_count (sheet->column_geometry) - 1) &&
- column_left_xpixel (sheet, g_sheet_column_get_column_count (sheet->column_geometry) - 1) +
+ g_sheet_column_start_pixel (sheet->column_geometry, g_sheet_column_get_column_count (sheet->column_geometry) - 1) +
g_sheet_column_get_width (sheet->column_geometry, g_sheet_column_get_column_count (sheet->column_geometry) - 1) < width)
{
column_move = FALSE;
static void
-gtk_sheet_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation)
+gtk_sheet_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
GtkSheet *sheet;
GtkAllocation sheet_allocation;
sheet_allocation.width = allocation->width - 2 * border_width;
sheet_allocation.height = allocation->height - 2 * border_width;
- sheet->sheet_window_width = sheet_allocation.width;
- sheet->sheet_window_height = sheet_allocation.height;
-
if (GTK_WIDGET_REALIZED (widget))
gdk_window_move_resize (sheet->sheet_window,
sheet_allocation.x,
if (sheet->row_titles_visible)
{
sheet->column_title_area.x = sheet->row_title_area.width;
- sheet->sheet_window_width -= sheet->row_title_area.width;
}
sheet->column_title_area.width = sheet_allocation.width ;
if (sheet->column_titles_visible)
{
sheet->row_title_area.y = sheet->column_title_area.height;
- sheet->sheet_window_height -= sheet->column_title_area.height;
}
sheet->row_title_area.height = sheet_allocation.height -
size_allocate_row_title_buttons (sheet);
size_allocate_column_title_buttons (sheet);
- /* re - scale backing pixmap */
- gtk_sheet_make_backing_pixmap (sheet);
-
/* set the scrollbars adjustments */
adjust_scrollbars (sheet);
}
static void
-size_allocate_column_title_buttons (GtkSheet * sheet)
+size_allocate_column_title_buttons (GtkSheet *sheet)
{
gint i;
gint x, width;
if (!GTK_WIDGET_REALIZED (sheet))
return;
-
- width = sheet->sheet_window_width;
+ gdk_drawable_get_size (sheet->sheet_window, &width, NULL);
x = 0;
if (sheet->row_titles_visible)
sheet->column_title_area.height);
}
- if (max_visible_column (sheet) == g_sheet_column_get_column_count (sheet->column_geometry) - 1)
+ if (max_visible_column (sheet) ==
+ g_sheet_column_get_column_count (sheet->column_geometry) - 1)
gdk_window_clear_area (sheet->column_title_window,
0, 0,
sheet->column_title_area.width,
}
static void
-size_allocate_row_title_buttons (GtkSheet * sheet)
+size_allocate_row_title_buttons (GtkSheet *sheet)
{
gint i;
- gint y, height;
+ gint y = 0;
+ gint height;
if (!sheet->row_titles_visible) return;
if (!GTK_WIDGET_REALIZED (sheet))
return;
- height = sheet->sheet_window_height;
- y = 0;
+ gdk_drawable_get_size (sheet->sheet_window, NULL, &height);
if (sheet->column_titles_visible)
{
sheet->row_title_area.width,
sheet->row_title_area.height);
}
+
if (max_visible_row (sheet) == g_sheet_row_get_row_count (sheet->row_geometry) - 1)
gdk_window_clear_area (sheet->row_title_window,
0, 0,
GtkEntry *sheet_entry;
GtkStyle *style = NULL, *previous_style = NULL;
gint row, col;
- gint size, max_size, text_size, column_width;
+ gint size, max_size, text_size;
const gchar *text;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
if (text && strlen (text) > 0)
text_size = STRING_WIDTH (GTK_WIDGET (sheet), attributes.font_desc, text);
- column_width = g_sheet_column_get_width (sheet->column_geometry, sheet->active_cell.col);
-
- size = MIN (text_size, max_size);
- size = MAX (size, column_width - 2 * COLUMN_TITLES_HEIGHT);
-
row = sheet->active_cell.row;
col = sheet->active_cell.col;
- shentry_allocation.x = column_left_xpixel (sheet, sheet->active_cell.col);
- shentry_allocation.y = g_sheet_row_start_pixel (sheet->row_geometry, sheet->active_cell.row);
- if ( sheet->column_titles_visible)
- shentry_allocation.y += sheet->column_title_area.height;
- shentry_allocation.y -= sheet->vadjustment->value;
+ rectangle_from_cell (sheet, row, col, &shentry_allocation);
- if ( sheet->row_titles_visible)
- shentry_allocation.x += sheet->row_title_area.width;
-
- shentry_allocation.x -= sheet->hadjustment->value;
-
- shentry_allocation.width = column_width;
- shentry_allocation.height = g_sheet_row_get_height (sheet->row_geometry, sheet->active_cell.row);
+ size = MIN (text_size, max_size);
+ size = MAX (size, shentry_allocation.width - 2 * COLUMN_TITLES_HEIGHT);
if (GTK_IS_ITEM_ENTRY (sheet->entry_widget))
{
switch (GTK_ITEM_ENTRY (sheet_entry)->justification)
{
case GTK_JUSTIFY_CENTER:
- shentry_allocation.x += column_width / 2 - size / 2;
+ shentry_allocation.x += shentry_allocation.width / 2 - size / 2;
break;
case GTK_JUSTIFY_RIGHT:
- shentry_allocation.x += column_width - size - COLUMN_TITLES_HEIGHT;
+ shentry_allocation.x += shentry_allocation.width - size - COLUMN_TITLES_HEIGHT;
break;
case GTK_JUSTIFY_LEFT:
case GTK_JUSTIFY_FILL:
gint row, col;
GtkJustification justification;
gchar *s = NULL;
+ gint width;
row = sheet->active_cell.row;
col = sheet->active_cell.col;
justification = GTK_ITEM_ENTRY (sheet->entry_widget)->justification;
+ gdk_drawable_get_size (sheet->sheet_window, &width, NULL);
+
switch (justification)
{
case GTK_JUSTIFY_FILL:
g_free (s);
break;
}
- size +=g_sheet_column_get_width (sheet->column_geometry, i);
+ size += g_sheet_column_get_width (sheet->column_geometry, i);
}
- size = MIN (size, sheet->sheet_window_width - column_left_xpixel (sheet, col));
+
+ size = MIN (size, width -
+ g_sheet_column_start_pixel (sheet->column_geometry, col));
break;
case GTK_JUSTIFY_RIGHT:
for (i = col - 1; i >= min_visible_column (sheet); i--)
g_free (s);
break;
}
- size +=g_sheet_column_get_width (sheet->column_geometry, i);
+ size += g_sheet_column_get_width (sheet->column_geometry, i);
}
break;
case GTK_JUSTIFY_CENTER:
g_free (s);
break;
}
- sizel +=g_sheet_column_get_width (sheet->column_geometry, i);
+ sizel += g_sheet_column_get_width (sheet->column_geometry, i);
}
size = 2 * MIN (sizel, sizer);
break;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
if (!sheet->column_titles_visible) return;
- if (!g_sheet_column_get_visibility (sheet->column_geometry, column)) return;
if (column < min_visible_column (sheet)) return;
if (column > max_visible_column (sheet)) return;
button = g_sheet_column_get_button (sheet->column_geometry, column);
allocation.y = 0;
- allocation.x = column_left_xpixel (sheet, column) + CELL_SPACING;
+ allocation.x = g_sheet_column_start_pixel (sheet->column_geometry, column) + CELL_SPACING;
allocation.x -= sheet->hadjustment->value;
allocation.height = sheet->column_title_area.height;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
if (!sheet->row_titles_visible) return;
- if (!g_sheet_row_get_visibility (sheet->row_geometry, row)) return;
if (row < min_visible_row (sheet)) return;
if (row > max_visible_row (sheet)) return;
static void
adjust_scrollbars (GtkSheet *sheet)
{
+ gint width, height;
+
+ if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return;
+
+ gdk_drawable_get_size (sheet->sheet_window, &width, &height);
+
if (sheet->vadjustment)
{
glong last_row = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
g_sheet_row_get_height (sheet->row_geometry, last_row);
sheet->vadjustment->page_increment =
- sheet->sheet_window_height -
+ height -
sheet->column_title_area.height -
g_sheet_row_get_height (sheet->row_geometry, last_row);
g_sheet_row_get_height (sheet->row_geometry, last_row)
;
+ if (sheet->column_titles_visible)
+ sheet->vadjustment->upper += sheet->column_title_area.height;
+
sheet->vadjustment->lower = 0;
- sheet->vadjustment->page_size = sheet->sheet_window_height;
+ sheet->vadjustment->page_size = height;
g_signal_emit_by_name (sheet->vadjustment, "changed");
}
gint last_col;
sheet->hadjustment->step_increment = 1 ; //DEFAULT_COLUMN_WIDTH;
- sheet->hadjustment->page_increment = sheet->sheet_window_width ;
+ sheet->hadjustment->page_increment = width;
last_col = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
g_sheet_column_get_width (sheet->column_geometry, last_col)
;
+ if (sheet->row_titles_visible)
+ sheet->hadjustment->upper += sheet->row_title_area.width;
+
sheet->hadjustment->lower = 0;
- sheet->hadjustment->page_size = sheet->sheet_window_width;
+ sheet->hadjustment->page_size = width;
g_signal_emit_by_name (sheet->hadjustment, "changed");
}
}
static void
-vadjustment_value_changed (GtkAdjustment * adjustment,
+vadjustment_value_changed (GtkAdjustment *adjustment,
gpointer data)
{
GtkSheet *sheet = GTK_SHEET (data);
static void
-hadjustment_value_changed (GtkAdjustment * adjustment,
+hadjustment_value_changed (GtkAdjustment *adjustment,
gpointer data)
{
GtkSheet *sheet = GTK_SHEET (data);
/* COLUMN RESIZING */
static void
-draw_xor_vline (GtkSheet * sheet)
+draw_xor_vline (GtkSheet *sheet)
{
+ gint height;
gint xpos = sheet->x_drag;
+ gdk_drawable_get_size (sheet->sheet_window,
+ NULL, &height);
+
if (sheet->row_titles_visible)
xpos += sheet->row_title_area.width;
xpos,
sheet->column_title_area.height,
xpos,
- sheet->sheet_window_height + CELL_SPACING);
+ height + CELL_SPACING);
}
/* ROW RESIZING */
static void
-draw_xor_hline (GtkSheet * sheet)
+draw_xor_hline (GtkSheet *sheet)
{
+ gint width;
gint ypos = sheet->y_drag;
+ gdk_drawable_get_size (sheet->sheet_window,
+ &width, NULL);
+
+
if (sheet->column_titles_visible)
ypos += sheet->column_title_area.height;
gdk_draw_line (GTK_WIDGET (sheet)->window, sheet->xor_gc,
sheet->row_title_area.width,
ypos,
- sheet->sheet_window_width + CELL_SPACING,
+ width + CELL_SPACING,
ypos);
}
GdkRectangle clip_area, area;
GdkGCValues values;
- area.x = column_left_xpixel (sheet, range.col0);
+ area.x = g_sheet_column_start_pixel (sheet->column_geometry, range.col0);
area.y = g_sheet_row_start_pixel (sheet->row_geometry, range.row0);
- area.width = column_left_xpixel (sheet, range.coli)- area.x+
+ area.width = g_sheet_column_start_pixel (sheet->column_geometry, range.coli)- area.x+
g_sheet_column_get_width (sheet->column_geometry, range.coli);
area.height = g_sheet_row_start_pixel (sheet->row_geometry, range.rowi)- area.y +
g_sheet_row_get_height (sheet->row_geometry, range.rowi);
clip_area.x = sheet->row_title_area.width;
clip_area.y = sheet->column_title_area.height;
- clip_area.width = sheet->sheet_window_width;
- clip_area.height = sheet->sheet_window_height;
+
+ gdk_drawable_get_size (sheet->sheet_window,
+ &clip_area.width, &clip_area.height);
if (!sheet->row_titles_visible) clip_area.x = 0;
if (!sheet->column_titles_visible) clip_area.y = 0;
static guint
new_column_width (GtkSheet *sheet, gint column, gint *x)
{
- gint left_pos = column_left_xpixel (sheet, column)
+ gint left_pos = g_sheet_column_start_pixel (sheet->column_geometry, column)
- sheet->hadjustment->value;
gint width = *x - left_pos;
}
static void
-gtk_sheet_set_column_width (GtkSheet * sheet,
+gtk_sheet_set_column_width (GtkSheet *sheet,
gint column,
guint width)
{
static void
-gtk_sheet_set_row_height (GtkSheet * sheet,
+gtk_sheet_set_row_height (GtkSheet *sheet,
gint row,
guint height)
{
g_signal_emit (sheet, sheet_signals[CHANGED], 0, row, - 1);
}
+
gboolean
gtk_sheet_get_attributes (const GtkSheet *sheet, gint row, gint col,
- GtkSheetCellAttr *attributes)
+ GtkSheetCellAttr *attr)
{
- const GdkColor *fg, *bg;
+ GdkColor *fg, *bg;
const GtkJustification *j ;
const PangoFontDescription *font_desc ;
const GtkSheetCellBorder *border ;
+ GdkColormap *colormap;
g_return_val_if_fail (sheet != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
if (row < 0 || col < 0) return FALSE;
- init_attributes (sheet, col, attributes);
+ attr->foreground = GTK_WIDGET (sheet)->style->black;
+ attr->background = sheet->color[BG_COLOR];
- if ( !sheet->model)
- return FALSE;
+ attr->border.width = 0;
+ attr->border.line_style = GDK_LINE_SOLID;
+ attr->border.cap_style = GDK_CAP_NOT_LAST;
+ attr->border.join_style = GDK_JOIN_MITER;
+ attr->border.mask = 0;
+ attr->border.color = GTK_WIDGET (sheet)->style->black;
+ attr->font_desc = GTK_WIDGET (sheet)->style->font_desc;
- attributes->is_editable = g_sheet_model_is_editable (sheet->model, row, col);
- attributes->is_visible = g_sheet_model_is_visible (sheet->model, row, col);
+ attr->is_editable = g_sheet_model_is_editable (sheet->model, row, col);
+ attr->is_visible = g_sheet_model_is_visible (sheet->model, row, col);
+ colormap = gtk_widget_get_colormap (GTK_WIDGET (sheet));
fg = g_sheet_model_get_foreground (sheet->model, row, col);
if ( fg )
- attributes->foreground = *fg;
+ {
+ gdk_colormap_alloc_color (colormap, fg, TRUE, TRUE);
+ attr->foreground = *fg;
+ }
bg = g_sheet_model_get_background (sheet->model, row, col);
if ( bg )
- attributes->background = *bg;
+ {
+ gdk_colormap_alloc_color (colormap, bg, TRUE, TRUE);
+ attr->background = *bg;
+ }
j = g_sheet_model_get_justification (sheet->model, row, col);
- if (j) attributes->justification = *j;
+ attr->justification = j ? *j : GTK_JUSTIFY_LEFT;
font_desc = g_sheet_model_get_font_desc (sheet->model, row, col);
- if ( font_desc ) attributes->font_desc = font_desc;
+ if ( font_desc ) attr->font_desc = font_desc;
border = g_sheet_model_get_cell_border (sheet->model, row, col);
- if ( border ) attributes->border = *border;
+ if ( border ) attr->border = *border;
return TRUE;
}
-static void
-init_attributes (const GtkSheet *sheet, gint col, GtkSheetCellAttr *attributes)
-{
- /* DEFAULT VALUES */
- attributes->foreground = GTK_WIDGET (sheet)->style->black;
- attributes->background = sheet->color[BG_COLOR];
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
- {
- attributes->background = sheet->color[BG_COLOR];
- }
- attributes->justification = g_sheet_column_get_justification (sheet->column_geometry, col);
- attributes->border.width = 0;
- attributes->border.line_style = GDK_LINE_SOLID;
- attributes->border.cap_style = GDK_CAP_NOT_LAST;
- attributes->border.join_style = GDK_JOIN_MITER;
- attributes->border.mask = 0;
- attributes->border.color = GTK_WIDGET (sheet)->style->black;
- attributes->is_editable = TRUE;
- attributes->is_visible = TRUE;
- attributes->font_desc = GTK_WIDGET (sheet)->style->font_desc;
-}
-
-
static void
gtk_sheet_button_size_request (GtkSheet *sheet,
const GtkSheetButton *button,
*requisition = button_requisition.height;
- sheet->row_requisition = * requisition;
+ sheet->row_requisition = *requisition;
}
static void
gtk_clipboard_clear (clipboard);
}
}
-
projects / pspp-builds.git / blobdiff