Maximized helper function

3 files changed, 10 insertions, 7 deletions

diff --git a/deck.c b/deck.c
index c863de7..35adee6 100644
--- a/deck.c
+++ b/deck.c
@@ -30,7 +30,6 @@ deck_get_slide_height (Deck *deck, int view_width)
 
 void
 deck_paint (Deck          *deck,
-	    FooScrollArea *area,
 	    cairo_t       *cr,
 	    int		   orig_x,
 	    int		   orig_y,
diff --git a/deck.h b/deck.h
index 8c64590..2c26d79 100644
--- a/deck.h
+++ b/deck.h
@@ -8,7 +8,6 @@ typedef void (* DeckChangeNotify) (gpointer data);
 Deck *deck_new              (DeckChangeNotify  notify,
 			     gpointer          data);
 void  deck_paint            (Deck             *deck,
-			     FooScrollArea    *area,
 			     cairo_t          *cr,
 			     int	       x,
 			     int	       y,
diff --git a/main.c b/main.c
index 9625abd..425aab3 100644
--- a/main.c
+++ b/main.c
@@ -44,7 +44,7 @@ on_thumbs_paint (FooScrollArea *scroll_area,
 
     foo_scroll_area_get_viewport (app->thumbnails, &viewport);
     
-    deck_paint (app->deck, scroll_area, cr, 0, 0, viewport.width);
+    deck_paint (app->deck, cr, 0, 0, viewport.width);
 }
 
 static void
@@ -59,12 +59,17 @@ on_thumbs_viewport_size_changed (FooScrollArea *scroll_area,
     foo_scroll_area_set_size (scroll_area, viewport->width, height);
 }
 
-static void
-offset_toolbar (App *app, GdkRectangle *viewport)
+static gboolean
+is_maximized (App *app)
 {
     GtkWidget *window = get_widget (app, "main_window");
+    return !!(gdk_window_get_state (window->window) & GDK_WINDOW_STATE_MAXIMIZED);
+}
 
-    if (!(gdk_window_get_state (window->window) & GDK_WINDOW_STATE_MAXIMIZED))
+static void
+offset_toolbar (App *app, GdkRectangle *viewport)
+{
+    if (!is_maximized (app))
     {
 	viewport->x += TOOLBAR_X_OFFSET;
 	viewport->y += TOOLBAR_Y_OFFSET;
@@ -106,7 +111,7 @@ on_main_paint (FooScrollArea *scroll_area,
 
     cairo_save (cr);
 
-    deck_paint (app->deck, scroll_area, cr, 0, 0, viewport.width);
+    deck_paint (app->deck, cr, 0, 0, viewport.width);
     paint_toolbar (app, scroll_area, cr);
     
     cairo_restore (cr);