week-header: implement event creation
This commit is contained in:
Georges Basile Stavracas Neto
@@ -422,6 +422,11 @@ weekgrid.now-strip {
|
|||||||
min-height: 2px;
|
min-height: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
weekgrid:selected {
|
weekgrid:selected,
|
||||||
|
.week-header:selected {
|
||||||
background-color: alpha(@theme_selected_bg_color, 0.4);
|
background-color: alpha(@theme_selected_bg_color, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.week-header:selected {
|
||||||
|
border: solid 1px alpha(@theme_selected_bg_color, 0.8);
|
||||||
|
}
|
||||||
|
|||||||
+95
-87
@@ -80,101 +80,109 @@
|
|||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkScrolledWindow" id="scrolledwindow">
|
<object class="GtkEventBox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="hscrollbar-policy">never</property>
|
<signal name="button-press-event" handler="on_button_pressed" object="GcalWeekHeader" swapped="yes" />
|
||||||
<property name="vscrollbar-policy">never</property>
|
<signal name="motion-notify-event" handler="on_motion_notify" object="GcalWeekHeader" swapped="yes" />
|
||||||
<property name="propagate-natural-height">True</property>
|
<signal name="button-release-event" handler="on_button_released" object="GcalWeekHeader" swapped="yes" />
|
||||||
<property name="margin-bottom">2</property>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkViewport">
|
<object class="GtkScrolledWindow" id="scrolledwindow">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="shadow_type">none</property>
|
<property name="hscrollbar-policy">never</property>
|
||||||
|
<property name="vscrollbar-policy">never</property>
|
||||||
|
<property name="propagate-natural-height">True</property>
|
||||||
|
<property name="margin-bottom">2</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkGrid" id="grid">
|
<object class="GtkViewport">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="column-homogeneous">True</property>
|
<property name="shadow_type">none</property>
|
||||||
<property name="hexpand">True</property>
|
|
||||||
<property name="column-spacing">6</property>
|
|
||||||
<property name="row-spacing">2</property>
|
|
||||||
<property name="margin-start">6</property>
|
|
||||||
<property name="margin-end">6</property>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox">
|
<object class="GtkGrid" id="grid">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
<property name="column-homogeneous">True</property>
|
||||||
|
<property name="hexpand">True</property>
|
||||||
|
<property name="column-spacing">6</property>
|
||||||
|
<property name="row-spacing">2</property>
|
||||||
|
<property name="margin-start">6</property>
|
||||||
|
<property name="margin-end">6</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">0</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">1</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">2</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">3</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">4</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">5</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left_attach">6</property>
|
||||||
|
<property name="top_attach">0</property>
|
||||||
|
<property name="width">1</property>
|
||||||
|
<property name="height">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
|
||||||
<property name="left_attach">0</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkBox">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="left_attach">1</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkBox">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="left_attach">2</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkBox">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="left_attach">3</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkBox">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="left_attach">4</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkBox">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="left_attach">5</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkBox">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="left_attach">6</property>
|
|
||||||
<property name="top_attach">0</property>
|
|
||||||
<property name="width">1</property>
|
|
||||||
<property name="height">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
|||||||
@@ -69,6 +69,9 @@ struct _GcalWeekHeader
|
|||||||
icaltimetype *active_date;
|
icaltimetype *active_date;
|
||||||
icaltimetype *current_date;
|
icaltimetype *current_date;
|
||||||
|
|
||||||
|
gint selection_start;
|
||||||
|
gint selection_end;
|
||||||
|
|
||||||
GtkSizeGroup *sizegroup;
|
GtkSizeGroup *sizegroup;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -141,6 +144,118 @@ destroy_event_widget (GcalWeekHeader *self,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Auxiliary methods */
|
/* Auxiliary methods */
|
||||||
|
static gboolean
|
||||||
|
on_button_pressed (GcalWeekHeader *self,
|
||||||
|
GdkEventButton *event,
|
||||||
|
GtkWidget *widget)
|
||||||
|
{
|
||||||
|
gboolean ltr;
|
||||||
|
gdouble column_width;
|
||||||
|
gint column;
|
||||||
|
gint width;
|
||||||
|
|
||||||
|
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
|
||||||
|
width = gtk_widget_get_allocated_width (widget);
|
||||||
|
column_width = width / 7.0;
|
||||||
|
column = ltr ? (event->x / column_width) : (7 - event->x / column_width);
|
||||||
|
|
||||||
|
self->selection_start = column;
|
||||||
|
self->selection_end = column;
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||||
|
|
||||||
|
return GDK_EVENT_STOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
on_motion_notify (GcalWeekHeader *self,
|
||||||
|
GdkEventMotion *event,
|
||||||
|
GtkWidget *widget)
|
||||||
|
{
|
||||||
|
gboolean ltr;
|
||||||
|
gdouble column_width;
|
||||||
|
gint column;
|
||||||
|
gint width;
|
||||||
|
|
||||||
|
if (!(event->state & GDK_BUTTON_PRESS_MASK))
|
||||||
|
return GDK_EVENT_PROPAGATE;
|
||||||
|
|
||||||
|
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
|
||||||
|
width = gtk_widget_get_allocated_width (widget);
|
||||||
|
column_width = width / 7.0;
|
||||||
|
column = ltr ? (event->x / column_width) : (7 - event->x / column_width);
|
||||||
|
|
||||||
|
self->selection_end = column;
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||||
|
|
||||||
|
return GDK_EVENT_STOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
on_button_released (GcalWeekHeader *self,
|
||||||
|
GdkEventButton *event,
|
||||||
|
GtkWidget *widget)
|
||||||
|
{
|
||||||
|
g_autoptr (GDateTime) week_start, selection_start, selection_end;
|
||||||
|
GtkWidget *weekview;
|
||||||
|
gboolean ltr;
|
||||||
|
gdouble column_width;
|
||||||
|
gint out_x, out_y;
|
||||||
|
gint column;
|
||||||
|
gint width;
|
||||||
|
gint start;
|
||||||
|
gint end;
|
||||||
|
|
||||||
|
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
|
||||||
|
width = gtk_widget_get_allocated_width (widget);
|
||||||
|
column_width = width / 7.0;
|
||||||
|
column = ltr ? (event->x / column_width) : (7 - event->x / column_width);
|
||||||
|
|
||||||
|
self->selection_end = column;
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||||
|
|
||||||
|
/* Fake the week view's event so we can control the X and Y values */
|
||||||
|
weekview = gtk_widget_get_ancestor (widget, GCAL_TYPE_WEEK_VIEW);
|
||||||
|
|
||||||
|
start = self->selection_start;
|
||||||
|
end = self->selection_end;
|
||||||
|
|
||||||
|
if (start > end)
|
||||||
|
{
|
||||||
|
start = start + end;
|
||||||
|
end = start - end;
|
||||||
|
start = start - end;
|
||||||
|
}
|
||||||
|
|
||||||
|
week_start = get_start_of_week (self->active_date);
|
||||||
|
selection_start = g_date_time_add_days (week_start, start);
|
||||||
|
selection_end = g_date_time_add_days (week_start, end + 1);
|
||||||
|
|
||||||
|
out_x = ltr ? (column_width * (column + 0.5)) : (width - column_width * (column + 0.5));
|
||||||
|
|
||||||
|
/* Translate X... */
|
||||||
|
gtk_widget_translate_coordinates (widget, weekview, out_x, 0, &out_x, NULL);
|
||||||
|
|
||||||
|
/* And Y */
|
||||||
|
gtk_widget_translate_coordinates (GTK_WIDGET (self),
|
||||||
|
weekview,
|
||||||
|
0,
|
||||||
|
gtk_widget_get_allocated_height (GTK_WIDGET (self)),
|
||||||
|
NULL,
|
||||||
|
&out_y);
|
||||||
|
|
||||||
|
g_signal_emit_by_name (weekview,
|
||||||
|
"create-event",
|
||||||
|
selection_start,
|
||||||
|
selection_end,
|
||||||
|
(gdouble) out_x,
|
||||||
|
(gdouble) out_y);
|
||||||
|
|
||||||
|
return GDK_EVENT_STOP;
|
||||||
|
}
|
||||||
|
|
||||||
static GcalEvent*
|
static GcalEvent*
|
||||||
get_event_by_uuid (GcalWeekHeader *self,
|
get_event_by_uuid (GcalWeekHeader *self,
|
||||||
const gchar *uuid)
|
const gchar *uuid)
|
||||||
@@ -1035,7 +1150,7 @@ gcal_week_header_draw (GtkWidget *widget,
|
|||||||
/* Fonts and colour selection */
|
/* Fonts and colour selection */
|
||||||
self = GCAL_WEEK_HEADER (widget);
|
self = GCAL_WEEK_HEADER (widget);
|
||||||
context = gtk_widget_get_style_context (widget);
|
context = gtk_widget_get_style_context (widget);
|
||||||
state = gtk_widget_get_state_flags (widget);
|
state = gtk_style_context_get_state (context);
|
||||||
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
|
ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
|
||||||
|
|
||||||
start_x = ltr ? gtk_widget_get_allocated_width (self->expand_button_box) : 0;
|
start_x = ltr ? gtk_widget_get_allocated_width (self->expand_button_box) : 0;
|
||||||
@@ -1071,6 +1186,38 @@ gcal_week_header_draw (GtkWidget *widget,
|
|||||||
alloc.width,
|
alloc.width,
|
||||||
alloc.height);
|
alloc.height);
|
||||||
|
|
||||||
|
/* Draw the selection background */
|
||||||
|
if (self->selection_start != -1 && self->selection_end != -1)
|
||||||
|
{
|
||||||
|
gint selection_width;
|
||||||
|
gint selection_x;
|
||||||
|
gint start, end;
|
||||||
|
|
||||||
|
start = self->selection_start;
|
||||||
|
end = self->selection_end;
|
||||||
|
|
||||||
|
if (start > end)
|
||||||
|
{
|
||||||
|
start = start + end;
|
||||||
|
end = start - end;
|
||||||
|
start = start - end;
|
||||||
|
}
|
||||||
|
|
||||||
|
gtk_style_context_save (context);
|
||||||
|
gtk_style_context_set_state (context, state | GTK_STATE_FLAG_SELECTED);
|
||||||
|
|
||||||
|
selection_width = (end - start + 1) * cell_width;
|
||||||
|
selection_x = ltr ? (start * cell_width) : (alloc.width - (start * cell_width + selection_width));
|
||||||
|
|
||||||
|
gtk_render_background (context, cr,
|
||||||
|
ALIGNED (start_x + selection_x),
|
||||||
|
start_y,
|
||||||
|
selection_width,
|
||||||
|
alloc.height - start_y);
|
||||||
|
|
||||||
|
gtk_style_context_restore (context);
|
||||||
|
}
|
||||||
|
|
||||||
pango_layout_get_pixel_size (layout, NULL, &font_height);
|
pango_layout_get_pixel_size (layout, NULL, &font_height);
|
||||||
|
|
||||||
for (i = 0; i < 7; i++)
|
for (i = 0; i < 7; i++)
|
||||||
@@ -1228,7 +1375,10 @@ gcal_week_header_class_init (GcalWeekHeaderClass *kclass)
|
|||||||
gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, week_label);
|
gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, week_label);
|
||||||
gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, year_label);
|
gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, year_label);
|
||||||
|
|
||||||
|
gtk_widget_class_bind_template_callback (widget_class, on_button_pressed);
|
||||||
|
gtk_widget_class_bind_template_callback (widget_class, on_button_released);
|
||||||
gtk_widget_class_bind_template_callback (widget_class, on_expand_action_activated);
|
gtk_widget_class_bind_template_callback (widget_class, on_expand_action_activated);
|
||||||
|
gtk_widget_class_bind_template_callback (widget_class, on_motion_notify);
|
||||||
|
|
||||||
gtk_widget_class_set_css_name (widget_class, "calendar-view");
|
gtk_widget_class_set_css_name (widget_class, "calendar-view");
|
||||||
}
|
}
|
||||||
@@ -1237,6 +1387,8 @@ static void
|
|||||||
gcal_week_header_init (GcalWeekHeader *self)
|
gcal_week_header_init (GcalWeekHeader *self)
|
||||||
{
|
{
|
||||||
self->expanded = FALSE;
|
self->expanded = FALSE;
|
||||||
|
self->selection_start = -1;
|
||||||
|
self->selection_end = -1;
|
||||||
|
|
||||||
gtk_widget_init_template (GTK_WIDGET (self));
|
gtk_widget_init_template (GTK_WIDGET (self));
|
||||||
}
|
}
|
||||||
@@ -1431,3 +1583,14 @@ gcal_week_header_get_sidebar_size_group (GcalWeekHeader *self)
|
|||||||
|
|
||||||
return self->sizegroup;
|
return self->sizegroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
gcal_week_header_clear_marks (GcalWeekHeader *self)
|
||||||
|
{
|
||||||
|
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||||
|
|
||||||
|
self->selection_start = -1;
|
||||||
|
self->selection_end = -1;
|
||||||
|
|
||||||
|
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||||
|
}
|
||||||
|
|||||||
@@ -54,6 +54,8 @@ GList* gcal_week_header_get_children_by_uuid (GcalWeekHeader
|
|||||||
|
|
||||||
GtkSizeGroup* gcal_week_header_get_sidebar_size_group (GcalWeekHeader *self);
|
GtkSizeGroup* gcal_week_header_get_sidebar_size_group (GcalWeekHeader *self);
|
||||||
|
|
||||||
|
void gcal_week_header_clear_marks (GcalWeekHeader *self);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* GCAL_WEEK_HEADER_H */
|
#endif /* GCAL_WEEK_HEADER_H */
|
||||||
|
|||||||
@@ -264,6 +264,7 @@ gcal_week_view_clear_marks (GcalView *view)
|
|||||||
{
|
{
|
||||||
GcalWeekView *self = GCAL_WEEK_VIEW (view);
|
GcalWeekView *self = GCAL_WEEK_VIEW (view);
|
||||||
|
|
||||||
|
gcal_week_header_clear_marks (GCAL_WEEK_HEADER (self->header));
|
||||||
gcal_week_grid_clear_marks (GCAL_WEEK_GRID (self->week_grid));
|
gcal_week_grid_clear_marks (GCAL_WEEK_GRID (self->week_grid));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user