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

month-view: remove useless field

Browse Source 
This also fixes the bug where changing the text
direction doesn't reposition the event widgets.
This commit is contained in:
Georges Basile Stavracas Neto
2017-11-19 12:11:02 -02:00
parent 2e750b69e5
commit 1f1e351c47
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/gcal-month-view.c
+5 -10
View File
@@ -124,9 +124,6 @@ struct _GcalMonthView
*/ */
gboolean use_24h_format; gboolean use_24h_format;
/* text direction factors */
gboolean k;
/* Storage for the accumulated scrolling */ /* Storage for the accumulated scrolling */
gdouble scroll_value; gdouble scroll_value;
guint update_grid_id; guint update_grid_id;
@@ -589,6 +586,9 @@ allocate_multiday_events (GcalMonthView *self,
GtkAllocation cell_allocation; GtkAllocation cell_allocation;
GtkBorder margin; GtkBorder margin;
GList *l; GList *l;
gboolean is_rtl;
is_rtl = gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL;
for (l = self->multi_cell_children; l; l = g_list_next (l)) for (l = self->multi_cell_children; l; l = g_list_next (l))
{ {
@@ -668,7 +668,7 @@ allocate_multiday_events (GcalMonthView *self,
* Retrieve the cell widget. On RTL languages, we use the last month cell as the starting * Retrieve the cell widget. On RTL languages, we use the last month cell as the starting
* point. * point.
*/ */
if (self->k) if (is_rtl)
month_cell = self->month_cell[last_block_cell / 7][last_block_cell % 7]; month_cell = self->month_cell[last_block_cell / 7][last_block_cell % 7];
else else
month_cell = self->month_cell[cell / 7][cell % 7]; month_cell = self->month_cell[cell / 7][cell % 7];
@@ -2023,10 +2023,7 @@ gcal_month_view_direction_changed (GtkWidget *widget,
{ {
GcalMonthView *self = GCAL_MONTH_VIEW (widget); GcalMonthView *self = GCAL_MONTH_VIEW (widget);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) self->pending_event_allocation = TRUE;
self->k = 0;
else if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
self->k = 1;
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
} }
@@ -2103,8 +2100,6 @@ gcal_month_view_init (GcalMonthView *self)
self->overflow_cells = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) g_list_free); self->overflow_cells = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) g_list_free);
self->pending_event_allocation = FALSE; self->pending_event_allocation = FALSE;
self->k = gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL;
/* Weekday header labels */ /* Weekday header labels */
self->weekday_label[0] = self->label_0; self->weekday_label[0] = self->label_0;
self->weekday_label[1] = self->label_1; self->weekday_label[1] = self->label_1;