From b5f235502262de83dbd8e1181977c3007b90f393 Mon Sep 17 00:00:00 2001 From: xbezdick <255993@mail.muni.cz> Date: Tue, 3 May 2011 15:16:41 +0200 Subject: [PATCH] Small cleanup --- shell/ev-dualscreen.c | 14 +++++++++----- shell/ev-presentation-timer.c | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c index a00338f2..8d474aaa 100644 --- a/shell/ev-dualscreen.c +++ b/shell/ev-dualscreen.c @@ -63,7 +63,7 @@ struct _EvDSCWindowPrivate { (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_DSCWINDOW, EvDSCWindowPrivate)) #define PAGE_CACHE_SIZE 52428800 /* 50MB */ #define SIDEBAR_DEFAULT_SIZE 300 -#define MAX_PRESENTATION_TIME 1440 /*60*24: ONE DAY*/ +#define MAX_PRESENTATION_TIME 1440 /*60*24 ONE DAY*/ G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW) @@ -176,10 +176,14 @@ ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwind g_free (uri); if (error == NULL){ ev_dscwindow->priv->notes_model = ev_document_model_new (); - ev_document_model_set_document (ev_dscwindow->priv->notes_model, ev_dscwindow->priv->notes_document); - ev_document_model_set_continuous (ev_dscwindow->priv->notes_model, FALSE); - ev_document_model_set_dual_page (ev_dscwindow->priv->notes_model, FALSE); - ev_document_model_set_sizing_mode (ev_dscwindow->priv->notes_model, EV_SIZING_BEST_FIT); + ev_document_model_set_document (ev_dscwindow->priv->notes_model, + ev_dscwindow->priv->notes_document); + ev_document_model_set_continuous (ev_dscwindow->priv->notes_model, + FALSE); + ev_document_model_set_dual_page (ev_dscwindow->priv->notes_model, + FALSE); + ev_document_model_set_sizing_mode (ev_dscwindow->priv->notes_model, + EV_SIZING_BEST_FIT); ev_document_model_set_page (ev_dscwindow->priv->notes_model, ev_document_model_get_page (ev_dscwindow->priv->model)); ev_view_set_model(EV_VIEW(ev_dscwindow->priv->notesview), diff --git a/shell/ev-presentation-timer.c b/shell/ev-presentation-timer.c index 5c8d2130..12c7d1be 100644 --- a/shell/ev-presentation-timer.c +++ b/shell/ev-presentation-timer.c @@ -65,8 +65,12 @@ ev_presentation_timer_draw(GtkWidget *timer, cairo_t *cr) cairo_stroke (cr); if(ev_timer->priv->running && ev_timer->priv->time > 0 && ev_timer->priv->remaining > 0) { - gdouble progress = ev_presentation_timer_progress (ev_timer->priv->time, ev_timer->priv->remaining)*(allocation.width); - cairo_rectangle (cr, allocation.width-progress, 10, (allocation.width-(allocation.width-progress))-10, allocation.height-5); + gdouble progress = ev_presentation_timer_progress (ev_timer->priv->time, + ev_timer->priv->remaining)*(allocation.width); + cairo_rectangle (cr, allocation.width-progress, + 10, + (allocation.width-(allocation.width-progress))-10, + allocation.height-5); cairo_stroke_preserve (cr); cairo_fill(cr); } -- 2.43.5