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

search-view: wrap date & time labels in a box

Browse Source 
Makes the upper grid more flexible.
This commit is contained in:
Georges Basile Stavracas Neto
2015-01-09 08:36:14 -05:00
committed by Erick Pérez Castellanos
parent 0bdff182f8
commit 41d685d5e3
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-search-view.c
+15 -7
View File
@@ -108,7 +108,7 @@ G_DEFINE_TYPE_WITH_CODE (GcalSearchView,
static GtkWidget* static GtkWidget*
get_event_from_grid (GtkWidget *grid) get_event_from_grid (GtkWidget *grid)
{ {
return gtk_grid_get_child_at (GTK_GRID (grid), 2, 0); return gtk_grid_get_child_at (GTK_GRID (grid), 1, 0);
} }
static GtkWidget* static GtkWidget*
@@ -118,6 +118,7 @@ make_grid_for_event (GcalSearchView *view,
GcalSearchViewPrivate *priv; GcalSearchViewPrivate *priv;
GDateTime *datetime; GDateTime *datetime;
GtkWidget *grid; GtkWidget *grid;
GtkWidget *box;
gchar *text; gchar *text;
GtkWidget *start_date; GtkWidget *start_date;
@@ -134,16 +135,21 @@ make_grid_for_event (GcalSearchView *view,
gtk_widget_set_valign (GTK_WIDGET (event), GTK_ALIGN_CENTER); gtk_widget_set_valign (GTK_WIDGET (event), GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (GTK_WIDGET (event), TRUE); gtk_widget_set_hexpand (GTK_WIDGET (event), TRUE);
/* grid */ /* grid & box*/
grid = gtk_grid_new (); grid = gtk_grid_new ();
box = gtk_grid_new ();
g_object_set (grid, g_object_set (grid,
"column-spacing", 6, "column-spacing", 6,
"column-homogeneous", TRUE,
"border-width", 6, "border-width", 6,
"margin-start", 12, "margin-start", 12,
"margin-end", 12, "margin-end", 12,
"hexpand", TRUE, NULL); "hexpand", TRUE, NULL);
gtk_grid_set_column_spacing (GTK_GRID (box), 6);
gtk_grid_set_column_homogeneous (GTK_GRID (box), TRUE);
gtk_widget_set_margin_end (box, 6);
/* start date & time */ /* start date & time */
datetime = g_date_time_new_local (start->year, start->month, start->day, start->hour, start->minute, start->second); datetime = g_date_time_new_local (start->year, start->month, start->day, start->hour, start->minute, start->second);
text = g_date_time_format (datetime, priv->date_mask); text = g_date_time_format (datetime, priv->date_mask);
@@ -164,12 +170,14 @@ make_grid_for_event (GcalSearchView *view,
g_date_time_unref (datetime); g_date_time_unref (datetime);
g_free (start); g_free (start);
/* labels: 20%; event widget: 80% */ /* labels: 10%; event widget: 90% */
gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (event), 2, 0, 10, 1); gtk_grid_attach (GTK_GRID (box), start_date, 0, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid), start_date, 0, 0, 1, 1); gtk_grid_attach (GTK_GRID (box), start_time, 1, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid), start_time, 1, 0, 1, 1); gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (event), 1, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid), box, 0, 0, 1, 1);
gtk_widget_show (start_date); gtk_widget_show (start_date);
gtk_widget_show (start_time); gtk_widget_show (start_time);
gtk_widget_show (box);
gtk_widget_show (grid); gtk_widget_show (grid);
gtk_widget_show (GTK_WIDGET (event)); gtk_widget_show (GTK_WIDGET (event));