Consistently use width

3 files changed, 21 insertions, 21 deletions

diff --git a/deck.c b/deck.c
index 05aea15..c863de7 100644
--- a/deck.c
+++ b/deck.c
@@ -23,10 +23,9 @@ deck_new (DeckChangeNotify notify,
 }
 
 int
-deck_get_slide_height (Deck *deck,
-		       GdkRectangle *viewport)
+deck_get_slide_height (Deck *deck, int view_width)
 {
-    return (viewport->width - 2 * MARGIN) / RATIO;
+    return (view_width - 2 * MARGIN) / RATIO;
 }
 
 void
@@ -39,11 +38,8 @@ deck_paint (Deck          *deck,
 {
     int height;
     int i;
-    GdkRectangle viewport;
-
-    foo_scroll_area_get_viewport (area, &viewport);
     
-    height = deck_get_slide_height (deck, &viewport);
+    height = deck_get_slide_height (deck, width);
 
     width -= 2 * MARGIN;
     
@@ -80,7 +76,7 @@ int
 deck_get_view_slide (Deck *deck,
 		     GdkRectangle *viewport)
 {
-    int slide_height = deck_get_slide_height (deck, viewport);
+    int slide_height = deck_get_slide_height (deck, viewport->width);
     
     /* Compute the y-coordinate of the first visible top edge of a slide */
     return (viewport->y - MARGIN) / (MARGIN + slide_height) + 1;
@@ -91,18 +87,18 @@ deck_get_view_slide (Deck *deck,
  */
 int
 deck_get_slide_location (Deck *deck,
-			 GdkRectangle *viewport,
+			 int view_width,
 			 int nth_slide)
 {
-    int slide_height = deck_get_slide_height (deck, viewport);
+    int slide_height = deck_get_slide_height (deck, view_width);
     
     return nth_slide * (MARGIN + slide_height) + MARGIN;
 }
 
 int
-deck_get_height (Deck *deck, GdkRectangle *viewport)
+deck_get_height (Deck *deck, int view_width)
 {
-    int slide_height = deck_get_slide_height (deck, viewport);
+    int slide_height = deck_get_slide_height (deck, view_width);
     
     return N_SLIDES * slide_height + (N_SLIDES + 1) * MARGIN;
 }
diff --git a/deck.h b/deck.h
index 57c5aa2..8c64590 100644
--- a/deck.h
+++ b/deck.h
@@ -25,11 +25,11 @@ deck_get_view_slide (Deck *deck,
  */
 int
 deck_get_slide_location (Deck *deck,
-			 GdkRectangle *viewport,
+			 int view_width,
 			 int nth_slide);
 int
 deck_get_slide_height (Deck *deck,
-		       GdkRectangle *viewport);
+		       int view_width);
 
 int
-deck_get_height (Deck *deck, GdkRectangle *viewport);
+deck_get_height (Deck *deck, int view_width);
diff --git a/main.c b/main.c
index 4af5269..9625abd 100644
--- a/main.c
+++ b/main.c
@@ -54,7 +54,7 @@ on_thumbs_viewport_size_changed (FooScrollArea *scroll_area,
 				 gpointer       data)
 {
     App *app = data;
-    int height = deck_get_height (app->deck, viewport);
+    int height = deck_get_height (app->deck, viewport->width);
 
     foo_scroll_area_set_size (scroll_area, viewport->width, height);
 }
@@ -119,7 +119,7 @@ on_main_viewport_size_changed (FooScrollArea *scroll_area,
 			       gpointer data)
 {
     App *app = data;
-    int height = deck_get_height (app->deck, new_viewport);
+    int height = deck_get_height (app->deck, new_viewport->width);
     static int first = 1;
     if (first)
     {
@@ -130,8 +130,12 @@ on_main_viewport_size_changed (FooScrollArea *scroll_area,
     if (old_viewport)
     {
 	int nth_slide = app->nth_slide; /* deck_get_view_slide (app->deck, old_viewport); */
-	int old_location = deck_get_slide_location (app->deck, old_viewport, nth_slide);
-	int new_location = deck_get_slide_location (app->deck, new_viewport, nth_slide);
+	int old_location = deck_get_slide_location (app->deck,
+						    old_viewport->width,
+						    nth_slide);
+	int new_location = deck_get_slide_location (app->deck,
+						    new_viewport->width,
+						    nth_slide);
 	foo_scroll_area_set_size_fixed_y (scroll_area, new_viewport->width,
 					  height, old_location, new_location);
     }
@@ -155,8 +159,8 @@ make_thumbnail_viewable (App *app)
 
     foo_scroll_area_get_viewport (area, &viewport);
 
-    top = deck_get_slide_location (app->deck, &viewport, app->nth_slide);
-    height = deck_get_slide_height (app->deck, &viewport);
+    top = deck_get_slide_location (app->deck, viewport.width, app->nth_slide);
+    height = deck_get_slide_height (app->deck, viewport.width);
 
     if (top - margin < viewport.y)
 	viewport.y = top - margin;