Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

month-view: fix line width inconsistencies

Browse Source 
The line width used for the grid changed over time, resulting in
different values used at different places. Introduce a LINE_WIDTH
definition and use it consistently throughout when drawing.

https://bugzilla.gnome.org/show_bug.cgi?id=763217
This commit is contained in:
fosero
2016-03-12 21:58:22 -03:00
committed by Georges Basile Stavracas Neto
parent ea5352bf87
commit 0fce5babcf
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-month-view.c
+11 -7
View File
@@ -31,6 +31,8 @@
#include <math.h> #include <math.h>
#define LINE_WIDTH 0.5
typedef struct typedef struct
{ {
GtkWidget *overflow_popover; GtkWidget *overflow_popover;
@@ -1622,25 +1624,25 @@ gcal_month_view_draw (GtkWidget *widget,
gtk_style_context_add_class (context, "lines"); gtk_style_context_add_class (context, "lines");
gtk_style_context_get_color (context, state, &color); gtk_style_context_get_color (context, state, &color);
cairo_set_line_width (cr, 0.5); cairo_set_line_width (cr, LINE_WIDTH);
gdk_cairo_set_source_rgba (cr, &color); gdk_cairo_set_source_rgba (cr, &color);
/* vertical lines, the easy ones */ /* vertical lines, the easy ones */
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
pos_x = cell_width * (i + 1); pos_x = cell_width * (i + 1);
cairo_move_to (cr, pos_x + 0.4, start_grid_y); cairo_move_to (cr, pos_x + (LINE_WIDTH / 2), start_grid_y);
cairo_rel_line_to (cr, 0, alloc.height - start_grid_y); cairo_rel_line_to (cr, 0, alloc.height - start_grid_y);
} }
/* top horizontal line */ /* top horizontal line */
cairo_move_to (cr, 0, start_grid_y + 0.4); cairo_move_to (cr, 0, start_grid_y + (LINE_WIDTH / 2));
cairo_rel_line_to (cr, alloc.width, 0); cairo_rel_line_to (cr, alloc.width, 0);
/* drawing weeks lines */ /* drawing weeks lines */
for (i = 0; i < (shown_rows % 2) + 5; i++) for (i = 0; i < (shown_rows % 2) + 5; i++)
{ {
pos_y = cell_height * (i + 0.5 * (2.0 - (shown_rows % 2))) + start_grid_y; pos_y = cell_height * (i + 0.5 * (2.0 - (shown_rows % 2))) + start_grid_y;
cairo_move_to (cr, 0, pos_y + 0.4); cairo_move_to (cr, 0, pos_y + (LINE_WIDTH / 2));
cairo_rel_line_to (cr, alloc.width, 0); cairo_rel_line_to (cr, alloc.width, 0);
} }
cairo_stroke (cr); cairo_stroke (cr);
@@ -1668,7 +1670,7 @@ gcal_month_view_draw (GtkWidget *widget,
gtk_style_context_restore (context); gtk_style_context_restore (context);
gdk_cairo_set_source_rgba (cr, &color); gdk_cairo_set_source_rgba (cr, &color);
cairo_set_line_width (cr, 0.4); cairo_set_line_width (cr, LINE_WIDTH);
/* horizontals */ /* horizontals */
if ((first_mark / 7) == (last_mark / 7)) if ((first_mark / 7) == (last_mark / 7))
@@ -1681,7 +1683,8 @@ gcal_month_view_draw (GtkWidget *widget,
pos_x2 = cell_width * (last_column + 1); pos_x2 = cell_width * (last_column + 1);
pos_y = cell_height * (row + first_row_gap) + start_grid_y; pos_y = cell_height * (row + first_row_gap) + start_grid_y;
pos_y2 = cell_height * (row + 1.0 + first_row_gap) + start_grid_y; pos_y2 = cell_height * (row + 1.0 + first_row_gap) + start_grid_y;
cairo_rectangle (cr, pos_x + 0.3, pos_y + 0.3, pos_x2 - pos_x + 0.6, pos_y2 - pos_y + 0.6); cairo_rectangle (cr, pos_x + (LINE_WIDTH / 2), pos_y + (LINE_WIDTH / 2),
pos_x2 - pos_x + (LINE_WIDTH / 2), pos_y2 - pos_y + (LINE_WIDTH / 2));
} }
else else
{ {
@@ -1711,7 +1714,8 @@ gcal_month_view_draw (GtkWidget *widget,
pos_y = cell_height * (i + first_row_gap) + start_grid_y; pos_y = cell_height * (i + first_row_gap) + start_grid_y;
pos_y2 = cell_height * (i + 1.0 + first_row_gap) + start_grid_y; pos_y2 = cell_height * (i + 1.0 + first_row_gap) + start_grid_y;
cairo_rectangle (cr, pos_x + 0.3, pos_y + 0.3, ((gint)end) + 0.6, pos_y2 - pos_y + 0.6); cairo_rectangle (cr, pos_x + (LINE_WIDTH / 2), pos_y + (LINE_WIDTH / 2),
(gint)end + (LINE_WIDTH / 2), pos_y2 - pos_y + (LINE_WIDTH / 2));
} }
} }