[gnumeric] Sheet Resize Dialog: make min/max follow the constants we have.



commit e4fc6da4f37675c27d629ce8fb6c272edbf897fd
Author: Morten Welinder <terra gnome org>
Date:   Sat May 2 19:04:44 2009 -0400

    Sheet Resize Dialog: make min/max follow the constants we have.
---
 src/dialogs/ChangeLog             |    5 +++++
 src/dialogs/dialog-sheet-resize.c |   15 ++++++++++++---
 src/sheet.c                       |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 6b31c32..52bffe2 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-02  Morten Welinder  <terra gnome org>
+
+	* dialog-sheet-resize.c (init_scale): Setup min and max too based
+	on GNM_{MIN,MAX}_{COLS,ROWS}.
+
 2009-05-01  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* cell-comment.glade: add additional labels and entry field
diff --git a/src/dialogs/dialog-sheet-resize.c b/src/dialogs/dialog-sheet-resize.c
index cd4595a..0796baf 100644
--- a/src/dialogs/dialog-sheet-resize.c
+++ b/src/dialogs/dialog-sheet-resize.c
@@ -93,9 +93,13 @@ mylog2 (int N)
 }
 
 static void
-init_scale (GtkWidget *scale, int N)
+init_scale (GtkWidget *scale, int N, int lo, int hi)
 {
 	GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (scale));
+	g_object_set (G_OBJECT (adj),
+		      "lower", (double)mylog2 (lo),
+		      "upper", (double)mylog2 (hi),
+		      NULL);
 	gtk_adjustment_set_value (adj, mylog2 (N));
 }
 
@@ -187,12 +191,17 @@ dialog_sheet_resize (WBCGtk *wbcg)
 	g_signal_connect_swapped (G_OBJECT (state->columns_scale),
 				  "value-changed", G_CALLBACK (cb_scale_changed),
 				  state);
-	init_scale (state->columns_scale, gnm_sheet_get_max_cols (state->sheet));
+	init_scale (state->columns_scale,
+		    gnm_sheet_get_max_cols (state->sheet),
+		    GNM_MIN_COLS, GNM_MAX_COLS);
 
 	g_signal_connect_swapped (G_OBJECT (state->rows_scale),
 				  "value-changed", G_CALLBACK (cb_scale_changed),
 				  state);
-	init_scale (state->rows_scale, gnm_sheet_get_max_rows (state->sheet));
+	init_scale (state->rows_scale,
+		    gnm_sheet_get_max_rows (state->sheet),
+		    GNM_MIN_ROWS, GNM_MAX_ROWS);
+
 	cb_scale_changed (state);
 
 	g_signal_connect_swapped (G_OBJECT (state->cancel_button),
diff --git a/src/sheet.c b/src/sheet.c
index de9d42b..bde7729 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -2093,7 +2093,7 @@ sheet_get_nominal_printarea (Sheet const *sheet)
 	}
 
 	range_ensure_sanity (&print_area, sheet);
-	
+
 	return print_area;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]