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

gcal-view: GcalViewChild struct field renamed

Browse Source
This commit is contained in:
Erick Pérez Castellanos
2014-12-04 17:10:22 -05:00
parent 3c1a1b89c1
commit 03af4df286
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-month-view.c
+6 -6
View File
@@ -436,7 +436,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
pos_y = vertical_block * (((i + priv->days_delay + 7 * february_gap ) / 7 ) + lines_gap_for_5); pos_y = vertical_block * (((i + priv->days_delay + 7 * february_gap ) / 7 ) + lines_gap_for_5);
if ((! gtk_widget_get_visible (child->widget)) if ((! gtk_widget_get_visible (child->widget))
&& (! child->hidden_by_me)) && (! child->hidden))
continue; continue;
gtk_widget_get_preferred_height (child->widget, gtk_widget_get_preferred_height (child->widget,
@@ -450,7 +450,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
> vertical_block) > vertical_block)
{ {
gtk_widget_hide (child->widget); gtk_widget_hide (child->widget);
child->hidden_by_me = TRUE; child->hidden = TRUE;
l = l->next; l = l->next;
for (; l != NULL; l = l->next) for (; l != NULL; l = l->next)
@@ -458,7 +458,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
child = (GcalViewChild*) l->data; child = (GcalViewChild*) l->data;
gtk_widget_hide (child->widget); gtk_widget_hide (child->widget);
child->hidden_by_me = TRUE; child->hidden = TRUE;
} }
break; break;
@@ -466,7 +466,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
else else
{ {
gtk_widget_show (child->widget); gtk_widget_show (child->widget);
child->hidden_by_me = FALSE; child->hidden = FALSE;
child_allocation.y = child_allocation.y + added_height; child_allocation.y = child_allocation.y + added_height;
gtk_widget_size_allocate (child->widget, &child_allocation); gtk_widget_size_allocate (child->widget, &child_allocation);
added_height += child_allocation.height; added_height += child_allocation.height;
@@ -999,7 +999,7 @@ gcal_month_view_add (GtkContainer *container,
new_child = g_new0 (GcalViewChild, 1); new_child = g_new0 (GcalViewChild, 1);
new_child->widget = widget; new_child->widget = widget;
new_child->hidden_by_me = FALSE; new_child->hidden = FALSE;
priv->days[date->day - 1] = priv->days[date->day - 1] =
g_list_insert_sorted (priv->days[date->day - 1], g_list_insert_sorted (priv->days[date->day - 1],
@@ -1316,7 +1316,7 @@ gcal_month_view_reposition_child (GcalView *view,
{ {
priv->days[i] = g_list_remove (priv->days[i], child); priv->days[i] = g_list_remove (priv->days[i], child);
child->hidden_by_me = TRUE; child->hidden = TRUE;
priv->days[date->day - 1] = priv->days[date->day - 1] =
g_list_insert_sorted (priv->days[date->day - 1], g_list_insert_sorted (priv->days[date->day - 1],
child, child,
src/gcal-view.h
+1 -1
View File
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
struct _GcalViewChild struct _GcalViewChild
{ {
GtkWidget *widget; GtkWidget *widget;
gboolean hidden_by_me; gboolean hidden;
}; };
typedef struct _GcalViewChild GcalViewChild; typedef struct _GcalViewChild GcalViewChild;
src/gcal-year-view.c
+6 -6
View File
@@ -417,7 +417,7 @@ gcal_year_view_size_allocate (GtkWidget *widget,
pos_y = ( i / 6 ) * vertical_block; pos_y = ( i / 6 ) * vertical_block;
if ((! gtk_widget_get_visible (child->widget)) if ((! gtk_widget_get_visible (child->widget))
&& (! child->hidden_by_me)) && (! child->hidden))
continue; continue;
gtk_widget_get_preferred_height (child->widget, gtk_widget_get_preferred_height (child->widget,
@@ -431,7 +431,7 @@ gcal_year_view_size_allocate (GtkWidget *widget,
> vertical_block) > vertical_block)
{ {
gtk_widget_hide (child->widget); gtk_widget_hide (child->widget);
child->hidden_by_me = TRUE; child->hidden = TRUE;
l = l->next; l = l->next;
for (; l != NULL; l = l->next) for (; l != NULL; l = l->next)
@@ -439,7 +439,7 @@ gcal_year_view_size_allocate (GtkWidget *widget,
child = (GcalViewChild*) l->data; child = (GcalViewChild*) l->data;
gtk_widget_hide (child->widget); gtk_widget_hide (child->widget);
child->hidden_by_me = TRUE; child->hidden = TRUE;
} }
break; break;
@@ -447,7 +447,7 @@ gcal_year_view_size_allocate (GtkWidget *widget,
else else
{ {
gtk_widget_show (child->widget); gtk_widget_show (child->widget);
child->hidden_by_me = FALSE; child->hidden = FALSE;
child_allocation.y = child_allocation.y + added_height; child_allocation.y = child_allocation.y + added_height;
gtk_widget_size_allocate (child->widget, &child_allocation); gtk_widget_size_allocate (child->widget, &child_allocation);
added_height += child_allocation.height; added_height += child_allocation.height;
@@ -661,7 +661,7 @@ gcal_year_view_add (GtkContainer *container,
new_child = g_new0 (GcalViewChild, 1); new_child = g_new0 (GcalViewChild, 1);
new_child->widget = widget; new_child->widget = widget;
new_child->hidden_by_me = FALSE; new_child->hidden = FALSE;
priv->months[date->month - 1] = priv->months[date->month - 1] =
g_list_insert_sorted (priv->months[date->month - 1], g_list_insert_sorted (priv->months[date->month - 1],
@@ -1128,7 +1128,7 @@ gcal_year_view_reposition_child (GcalView *view,
{ {
priv->months[i] = g_list_remove (priv->months[i], child); priv->months[i] = g_list_remove (priv->months[i], child);
child->hidden_by_me = TRUE; child->hidden = TRUE;
priv->months[date->month - 1] = priv->months[date->month - 1] =
g_list_insert_sorted (priv->months[date->month - 1], g_list_insert_sorted (priv->months[date->month - 1],
child, child,