[planner: 25/32] Handle GTK 3.4 deprecations
- From: Mart Raudsepp <mraudsepp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planner: 25/32] Handle GTK 3.4 deprecations
- Date: Sun, 20 Jun 2021 18:13:51 +0000 (UTC)
commit 2079b52349d82653dee9aa3b8013eccac046ca68
Author: Mart Raudsepp <leio gentoo org>
Date: Sun Jun 13 23:41:28 2021 +0300
Handle GTK 3.4 deprecations
GdkColor -> GdkRGBA
src/planner-gantt-row.c | 80 ++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/src/planner-gantt-row.c b/src/planner-gantt-row.c
index 31d06402..499231c3 100644
--- a/src/planner-gantt-row.c
+++ b/src/planner-gantt-row.c
@@ -99,13 +99,13 @@ typedef enum
struct _PlannerGanttRowPriv {
/* FIXME: Don't need those per gantt row. */
- GdkColor color_normal;
- GdkColor color_normal_light;
- GdkColor color_normal_dark;
+ GdkRGBA color_normal;
+ GdkRGBA color_normal_light;
+ GdkRGBA color_normal_dark;
- GdkColor color_critical;
- GdkColor color_critical_light;
- GdkColor color_critical_dark;
+ GdkRGBA color_critical;
+ GdkRGBA color_critical_light;
+ GdkRGBA color_critical_dark;
/* FIXME: Don't need this per gantt row? */
PangoLayout *layout;
@@ -401,12 +401,12 @@ gantt_row_init (PlannerGanttRow *row)
priv->mouse_over_index = -1;
priv->resource_widths = g_array_new (TRUE, FALSE, sizeof (gint));
- gdk_color_parse ("LightSkyBlue3", &priv->color_normal);
- gdk_color_parse ("#9ac7e0", &priv->color_normal_light);
- gdk_color_parse ("#7da1b5", &priv->color_normal_dark);
- gdk_color_parse ("indian red", &priv->color_critical);
- gdk_color_parse ("#de6464", &priv->color_critical_light);
- gdk_color_parse ("#ba5454", &priv->color_critical_dark);
+ gdk_rgba_parse (&priv->color_normal, "LightSkyBlue3");
+ gdk_rgba_parse (&priv->color_normal_light, "#9ac7e0");
+ gdk_rgba_parse (&priv->color_normal_dark, "#7da1b5");
+ gdk_rgba_parse (&priv->color_critical, "indian red");
+ gdk_rgba_parse (&priv->color_critical_light, "#de6464");
+ gdk_rgba_parse (&priv->color_critical_dark, "#ba5454");
}
static void
@@ -978,10 +978,10 @@ static gboolean gantt_draw_tasktime(cairo_t *cr,
ttime_x2 -= x; ttime_y2 -= y;
if (ttime_x2 > ttime_x1) {
- GdkColor color;
+ GdkRGBA color;
- gdk_color_parse (colorname, &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, colorname);
+ gdk_cairo_set_source_rgba (cr, &color);
if (is_up) {
cairo_rectangle (cr,
@@ -989,8 +989,8 @@ static gboolean gantt_draw_tasktime(cairo_t *cr,
ttime_x2 - ttime_x1, cy1 - ttime_y1);
cairo_fill (cr);
- gdk_color_parse ("gray40", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "gray40");
+ gdk_cairo_set_source_rgba (cr, &color);
cairo_move_to (cr, ttime_x1 + 0.5, ttime_y1 + 0.5);
cairo_line_to (cr, ttime_x2 - 1 + 0.5, ttime_y1 + 0.5);
@@ -1004,8 +1004,8 @@ static gboolean gantt_draw_tasktime(cairo_t *cr,
ttime_x2 - ttime_x1, ttime_y2 - cy2 - 1);
cairo_fill (cr);
- gdk_color_parse ("gray40", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "gray40");
+ gdk_cairo_set_source_rgba (cr, &color);
cairo_move_to (cr, ttime_x1 + 0.5, ttime_y2 + 0.5);
cairo_line_to (cr, ttime_x2 - 1 + 0.5, ttime_y2 + 0.5);
@@ -1053,7 +1053,7 @@ gantt_row_draw (GnomeCanvasItem *item,
GList *unit_ivals, *cal_ivals, *cur_unit;
GList *cur_cal = NULL;
- GdkColor color;
+ GdkRGBA color;
gint x_start, x_end, y_dumb, is_a_gap, is_a_subgap;
MrpUnitsInterval *unit_ival, ival_buf;
MrpInterval *ival_subbuf = NULL, *cal_ival = NULL;
@@ -1195,8 +1195,8 @@ gantt_row_draw (GnomeCanvasItem *item,
if (assignments) {
/* #define DRAW_BACKGROUND_CHECK 1 */
#ifdef DRAW_BACKGROUND_CHECK
- gdk_color_parse ("indian red", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "indian red");
+ gdk_cairo_set_source_rgba (cr, &color);
cairo_rectangle (cr, rx1, cy1, rx2 - rx1, cy2 - cy1);
cairo_fill (cr);
#endif
@@ -1460,9 +1460,9 @@ gantt_row_draw (GnomeCanvasItem *item,
topy = floor ((cy1 + ((1.0 - (double)delta) * (double)(cy2 - cy1 - 3))) +
0.5);
if (!highlight_critical || !critical) {
- gdk_cairo_set_source_color (cr, &priv->color_normal);
+ gdk_cairo_set_source_rgba (cr, &priv->color_normal);
} else {
- gdk_cairo_set_source_color (cr, &priv->color_critical);
+ gdk_cairo_set_source_rgba (cr, &priv->color_critical);
}
if (wunits_draw_it) {
@@ -1482,8 +1482,8 @@ gantt_row_draw (GnomeCanvasItem *item,
cairo_fill (cr);
}
if (topy - cy1 > 0) {
- gdk_color_parse ("white", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "white");
+ gdk_cairo_set_source_rgba (cr, &color);
cairo_rectangle (cr, wunits_x_start,
cy1+2,
x_end - wunits_x_start,
@@ -1591,9 +1591,9 @@ gantt_row_draw (GnomeCanvasItem *item,
}
else { /* if (assignments) ... */
if (!highlight_critical || !critical) {
- gdk_cairo_set_source_color (cr, &priv->color_normal);
+ gdk_cairo_set_source_rgba (cr, &priv->color_normal);
} else {
- gdk_cairo_set_source_color (cr, &priv->color_critical);
+ gdk_cairo_set_source_rgba (cr, &priv->color_critical);
}
cairo_rectangle (cr,
rx1,
@@ -1611,8 +1611,8 @@ gantt_row_draw (GnomeCanvasItem *item,
if (rx1 <= complete_x2) {
/* TODO: This and many other things code duplicated in planner-usage-row.c */
/* TODO: Improve design of completed percentage bar; perhaps add borders? */
- gdk_color_parse ("LightSkyBlue1", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "LightSkyBlue1");
+ gdk_cairo_set_source_rgba (cr, &color);
cairo_rectangle (cr, rx1, cy1 + 5,
complete_x2 - rx1, cy2 - cy1 - 9);
cairo_fill (cr);
@@ -1622,7 +1622,7 @@ gantt_row_draw (GnomeCanvasItem *item,
#ifdef WITH_SIMPLE_PRIORITY_SCHEDULING
for (i = 0 ; i < (is_dominant && !(!summary && priv->highlight) ? 2 : 1) ; ++i) {
if (i == 1) {
- gdk_cairo_set_source_color (cr, &priv->color_critical);
+ gdk_cairo_set_source_rgba (cr, &priv->color_critical);
gantt_row_setup_frame_dashes (row, cr, TRUE);
cairo_move_to (cr, rx1 + 0.5, cy1 + 0.5);
cairo_line_to (cr, rx2 + 0.5, cy1 + 0.5);
@@ -1631,8 +1631,8 @@ gantt_row_draw (GnomeCanvasItem *item,
cairo_stroke (cr);
} else {
#endif
- gdk_color_parse ("black", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "black");
+ gdk_cairo_set_source_rgba (cr, &color);
gantt_row_setup_frame_dashes (row, cr, priv->highlight);
cairo_move_to (cr, rx1 + 0.5, cy1 + 0.5);
cairo_line_to (cr, rx2 + 0.5, cy1 + 0.5);
@@ -1647,9 +1647,9 @@ gantt_row_draw (GnomeCanvasItem *item,
gantt_row_setup_frame_dashes (row, cr, FALSE);
if (!highlight_critical || !critical) {
- gdk_cairo_set_source_color (cr, &priv->color_normal_light);
+ gdk_cairo_set_source_rgba (cr, &priv->color_normal_light);
} else {
- gdk_cairo_set_source_color (cr, &priv->color_critical_light);
+ gdk_cairo_set_source_rgba (cr, &priv->color_critical_light);
}
cairo_move_to (cr, rx1 + 0 + 0.5, cy1 + 1 + 0.5);
@@ -1663,9 +1663,9 @@ gantt_row_draw (GnomeCanvasItem *item,
cairo_stroke (cr);
if (!highlight_critical || !critical) {
- gdk_cairo_set_source_color (cr, &priv->color_normal_dark);
+ gdk_cairo_set_source_rgba (cr, &priv->color_normal_dark);
} else {
- gdk_cairo_set_source_color (cr, &priv->color_critical_dark);
+ gdk_cairo_set_source_rgba (cr, &priv->color_critical_dark);
}
cairo_move_to (cr, rx1 + 0 + 0.5, cy2 - 1 + 0.5);
@@ -1681,12 +1681,12 @@ gantt_row_draw (GnomeCanvasItem *item,
#ifdef WITH_SIMPLE_PRIORITY_SCHEDULING
for (i = 0 ; i < (is_dominant && !(!summary && priv->highlight) ? 2 : 1) ; ++i) {
if (i == 1) {
- gdk_cairo_set_source_color (cr, &priv->color_critical);
+ gdk_cairo_set_source_rgba (cr, &priv->color_critical);
gantt_row_setup_frame_dashes (row, cr, TRUE);
} else {
#endif
- gdk_color_parse ("black", &color);
- gdk_cairo_set_source_color (cr, &color);
+ gdk_rgba_parse (&color, "black");
+ gdk_cairo_set_source_rgba (cr, &color);
gantt_row_setup_frame_dashes (row, cr, priv->highlight);
#ifdef WITH_SIMPLE_PRIORITY_SCHEDULING
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
