[gnome-calendar/wip/pandusonu/week-view: 1/21] week-grid, week-header: improve rendering of vertical lines



commit 1c048fb5383f25b1a05b6c36e08b9b7656875037
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Dec 7 21:31:48 2016 -0200

    week-grid, week-header: improve rendering of vertical lines

 src/views/gcal-week-grid.c   |    7 ++++---
 src/views/gcal-week-header.c |    5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
index 9d04dbb..0b1dc03 100644
--- a/src/views/gcal-week-grid.c
+++ b/src/views/gcal-week-grid.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <math.h>
 
+#define ALIGNED(x)      (round (x) + 0.5)
 #define MINUTES_PER_DAY 1440
 #define MAX_MINUTES     (7 * MINUTES_PER_DAY)
 
@@ -370,14 +371,14 @@ gcal_week_grid_draw (GtkWidget *widget,
   /* Vertical lines */
   for (i = 0; i < 7; i++)
     {
-      cairo_move_to (cr, ((width) / 7) * i + 0.4, 0);
+      cairo_move_to (cr, ALIGNED (((width) / 7.0) * i), 0);
       cairo_rel_line_to (cr, 0, height);
     }
 
   /* Horizontal lines */
   for (i = 1; i < 24; i++)
     {
-      cairo_move_to (cr, 0, (height / 24) * i + 0.4);
+      cairo_move_to (cr, 0, ALIGNED ((height / 24.0) * i));
       cairo_rel_line_to (cr, width, 0);
     }
 
@@ -388,7 +389,7 @@ gcal_week_grid_draw (GtkWidget *widget,
 
   for (i = 0; i < 24; i++)
     {
-      cairo_move_to (cr, 0, (height / 24) * i + (height / 48) + 0.4);
+      cairo_move_to (cr, 0, ALIGNED ((height / 24.0) * i + (height / 48.0)));
       cairo_rel_line_to (cr, width, 0);
     }
 
diff --git a/src/views/gcal-week-header.c b/src/views/gcal-week-header.c
index fc5d61a..aa53684 100644
--- a/src/views/gcal-week-header.c
+++ b/src/views/gcal-week-header.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <math.h>
 
+#define ALIGNED(x)           (round (x) + 0.5)
 #define COLUMN_PADDING       6
 
 struct _GcalWeekHeader
@@ -934,7 +935,7 @@ gcal_week_header_draw (GcalWeekHeader *self,
   current_cell = icaltime_day_of_week (*(self->active_date)) - 1;
   current_cell = (7 + current_cell - self->first_weekday) % 7;
 
-  cell_width = alloc.width / 7;
+  cell_width = alloc.width / 7.0;
   pango_layout_get_pixel_size (layout, NULL, &font_height);
 
   for (i = 0; i < 7; i++)
@@ -983,7 +984,7 @@ gcal_week_header_draw (GcalWeekHeader *self,
 
       /* Draws the lines after each day of the week */
       cairo_move_to (cr,
-                     cell_width * i + 0.5,
+                     ALIGNED (cell_width * i),
                      font_height + padding.bottom);
 
       cairo_set_line_width (cr, 0.25);


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