Don't set row/column to zero when selecting

[pspp-builds.git] / lib / gtksheet / gtksheet.c

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 94c56f340473e914f2b7dafac5cd0d1a6cfa6439..088a1aba20c87aa98429d1bd745ddb8dcfc6d46d 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -91,6 +91,7 @@ static void set_entry_widget_font (GtkSheet *sheet);
 static void gtk_sheet_update_primary_selection (GtkSheet *sheet);
 static void draw_column_title_buttons_range (GtkSheet *sheet, gint first, gint n);
 static void draw_row_title_buttons_range (GtkSheet *sheet, gint first, gint n);
+static void redraw_range (GtkSheet *sheet, GtkSheetRange *range);
 
 
 static void set_row_height (GtkSheet *sheet,
@@ -421,7 +422,7 @@ static void gtk_sheet_forall                         (GtkContainer *container,
                                                  GtkCallback callback,
                                                  gpointer callback_data);
 
-static void gtk_sheet_set_scroll_adjustments    (GtkSheet *sheet,
+static gboolean gtk_sheet_set_scroll_adjustments  (GtkSheet *sheet,
                                                  GtkAdjustment *hadjustment,
                                                  GtkAdjustment *vadjustment);
 
@@ -668,6 +669,21 @@ enum
     PROP_MODEL
   };
 
+static void
+resize_column (GtkSheet *sheet, gint unit, glong size)
+{
+  GtkSheetRange range;
+  range.col0 = unit;
+  range.coli = max_visible_column (sheet);
+  range.row0 = min_visible_row (sheet);
+  range.rowi = max_visible_row (sheet);
+
+  redraw_range (sheet, &range);
+
+  draw_column_title_buttons_range (sheet, range.col0, range.coli);
+}
+
+
 static void
 gtk_sheet_set_horizontal_axis (GtkSheet *sheet, PsppireAxis *a)
 {
@@ -675,11 +691,26 @@ gtk_sheet_set_horizontal_axis (GtkSheet *sheet, PsppireAxis *a)
     g_object_unref (sheet->haxis);
 
   sheet->haxis = a;
+  g_signal_connect_swapped (a, "resize-unit", G_CALLBACK (resize_column), sheet);
 
   if ( sheet->haxis )
     g_object_ref (sheet->haxis);
 }
 
+static void
+resize_row (GtkSheet *sheet, gint unit, glong size)
+{
+  GtkSheetRange range;
+  range.col0 = min_visible_column (sheet);
+  range.coli = max_visible_column (sheet);
+  range.row0 = unit;
+  range.rowi = max_visible_row (sheet);
+
+  redraw_range (sheet, &range);
+
+  draw_row_title_buttons_range (sheet, range.row0, range.rowi);
+}
+
 static void
 gtk_sheet_set_vertical_axis (GtkSheet *sheet, PsppireAxis *a)
 {
@@ -688,6 +719,8 @@ gtk_sheet_set_vertical_axis (GtkSheet *sheet, PsppireAxis *a)
 
   sheet->vaxis = a;
 
+  g_signal_connect_swapped (a, "resize-unit", G_CALLBACK (resize_row), sheet);
+
   if ( sheet->vaxis )
     g_object_ref (sheet->vaxis);
 }
@@ -1508,7 +1541,6 @@ gtk_sheet_select_row (GtkSheet *sheet, gint row)
   sheet->range.rowi = row;
   sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
   sheet->active_cell.row = row;
-  sheet->active_cell.col = 0;
 
   g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row);
   gtk_sheet_real_select_range (sheet, NULL);
@@ -1532,7 +1564,6 @@ gtk_sheet_select_column (GtkSheet *sheet, gint column)
   sheet->range.col0 = column;
   sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
   sheet->range.coli = column;
-  sheet->active_cell.row = 0;
   sheet->active_cell.col = column;
 
   g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column);
@@ -1603,7 +1634,7 @@ gtk_sheet_get_visible_range (GtkSheet *sheet, GtkSheetRange *range)
 }
 
 
-static void
+static gboolean
 gtk_sheet_set_scroll_adjustments (GtkSheet *sheet,
                                  GtkAdjustment *hadjustment,
                                  GtkAdjustment *vadjustment)
@@ -1613,24 +1644,34 @@ gtk_sheet_set_scroll_adjustments (GtkSheet *sheet,
       if (sheet->vadjustment)
        g_object_unref (sheet->vadjustment);
       sheet->vadjustment = vadjustment;
-      g_object_ref (vadjustment);
 
-      g_signal_connect (sheet->vadjustment, "value_changed",
-                       G_CALLBACK (vadjustment_value_changed),
-                       sheet);
+      if ( vadjustment)
+       {
+         g_object_ref (vadjustment);
+
+         g_signal_connect (sheet->vadjustment, "value_changed",
+                           G_CALLBACK (vadjustment_value_changed),
+                           sheet);
+       }
     }
 
   if ( sheet->hadjustment != hadjustment )
     {
       if (sheet->hadjustment)
        g_object_unref (sheet->hadjustment);
+
       sheet->hadjustment = hadjustment;
-      g_object_ref (hadjustment);
 
-      g_signal_connect (sheet->hadjustment, "value_changed",
-                       G_CALLBACK (hadjustment_value_changed),
-                       sheet);
+      if ( hadjustment)
+       {
+         g_object_ref (hadjustment);
+
+         g_signal_connect (sheet->hadjustment, "value_changed",
+                           G_CALLBACK (hadjustment_value_changed),
+                           sheet);
+       }
     }
+  return TRUE;
 }
 
 static void
@@ -1736,8 +1777,6 @@ gtk_sheet_realize (GtkWidget *widget)
 
   sheet = GTK_SHEET (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
   colormap = gtk_widget_get_colormap (widget);
   display = gtk_widget_get_display (widget);
 
@@ -1858,6 +1897,9 @@ gtk_sheet_realize (GtkWidget *widget)
   draw_column_title_buttons (sheet);
 
   gtk_sheet_update_primary_selection (sheet);
+
+
+  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 }
 
 static void
@@ -2474,9 +2516,6 @@ gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint col)
       col >= psppire_axis_unit_count (sheet->haxis))
     return;
 
-  sheet->active_cell.row = row;
-  sheet->active_cell.col = col;
-
   if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
     return;