[gnome-calendar] month-view: rewrite was a template widget
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] month-view: rewrite was a template widget
- Date: Fri, 6 Oct 2017 23:32:51 +0000 (UTC)
commit e59910f0e987ef71f0cd90ee9b66ceb5cf4eba61
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Sep 14 19:19:19 2017 -0300
month-view: rewrite was a template widget
data/calendar.gresource.xml | 2 +
data/meson.build | 2 +
data/theme/gtk-styles.css | 102 ++-
data/ui/month-cell.ui | 75 ++
data/ui/month-view.ui | 206 +++++
data/ui/week-header.ui | 6 +-
src/gcal-utils.c | 34 +
src/gcal-utils.h | 6 +
src/meson.build | 1 +
src/views/gcal-month-cell.c | 616 ++++++++++++++
src/views/gcal-month-cell.h | 64 ++
src/views/gcal-month-view.c | 1917 ++++++++++++++-----------------------------
src/views/gcal-year-view.c | 4 +-
13 files changed, 1701 insertions(+), 1334 deletions(-)
---
diff --git a/data/calendar.gresource.xml b/data/calendar.gresource.xml
index 4921985..ccfe72d 100644
--- a/data/calendar.gresource.xml
+++ b/data/calendar.gresource.xml
@@ -7,6 +7,8 @@
<file alias="date-selector.ui" compressed="true" preprocess="xml-stripblanks">ui/date-selector.ui</file>
<file alias="edit-dialog.ui" compressed="true" preprocess="xml-stripblanks">ui/edit-dialog.ui</file>
<file alias="event-widget.ui" compressed="true" preprocess="xml-stripblanks">ui/event-widget.ui</file>
+ <file alias="month-cell.ui" compressed="true" preprocess="xml-stripblanks">ui/month-cell.ui</file>
+ <file alias="month-view.ui" compressed="true" preprocess="xml-stripblanks">ui/month-view.ui</file>
<file alias="multi-choice.ui" compressed="true" preprocess="xml-stripblanks">ui/multi-choice.ui</file>
<file alias="online-account-row.ui" compressed="true"
preprocess="xml-stripblanks">ui/online-account-row.ui</file>
<file alias="quick-add-popover.ui" compressed="true"
preprocess="xml-stripblanks">ui/quick-add-popover.ui</file>
diff --git a/data/meson.build b/data/meson.build
index 149437b..baa50cb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -54,6 +54,8 @@ resource_data = files(
'ui/edit-dialog.ui',
'ui/help-overlay.ui',
'ui/menus.ui',
+ 'ui/month-cell.ui',
+ 'ui/month-view.ui',
'ui/multi-choice.ui',
'ui/quick-add-popover.ui',
'ui/search-view.ui',
diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index 01577a3..1197659 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -1,19 +1,14 @@
@define-color event_shadow_color alpha(black, 0.2);
-.nav-button {
- background-color: transparent;
- background-image: none;
-}
-
-/* nav-bar labels */
-.start-header {
+/* Header labels */
+label.primary-label {
font-size: 16pt;
font-weight: bold;
color: @theme_selected_bg_color;
padding: 12px;
}
-.end-header {
+label.secondary-label {
font-size: 16pt;
font-weight: bold;
padding: 12px;
@@ -25,7 +20,8 @@ calendar-view {
font-size: 10pt;
}
-calendar-view.header {
+calendar-view.header,
+label.header {
font-size: 10pt;
font-weight: bold;
color: alpha(@theme_fg_color, 0.55);
@@ -41,25 +37,6 @@ calendar-view:selected {
font-weight: bold;
}
-calendar-view.overflow:hover {
- font-weight: bold;
- color: @theme_selected_bg_color;
- background-image: linear-gradient(to bottom, shade(@theme_bg_color, 0.9), alpha(@theme_bg_color, 0.2)
10%,
- alpha(@theme_bg_color, 0.2) 95%, shade(@theme_bg_color, 0.95) 100%);
-}
-
-calendar-view.overflow {
- font-size: 8pt;
-}
-
-calendar-view.lines {
- color: alpha(@theme_fg_color, 0.4);
-}
-
-calendar-view.offset {
- background-color: alpha(@theme_bg_color, 0.5);
-}
-
/* Year View CSS */
.year-view {
padding: 0px;
@@ -364,6 +341,13 @@ datechooser day:selected:hover {
font-weight: bold;
}
+label.month-name {
+ font-size: 16pt;
+ font-weight: bold;
+ color: alpha(@theme_selected_bg_color, 0.75);
+ padding: 12px;
+}
+
/* Week View CSS */
.week-header {
@@ -371,13 +355,6 @@ datechooser day:selected:hover {
border-bottom: solid @borders 1px;
}
-.week-header .month-name {
- font-size: 16pt;
- font-weight: bold;
- color: alpha(@theme_selected_bg_color, 0.75);
- padding: 12px;
-}
-
.week-header .week-number {
font-size: 16pt;
font-weight: bold;
@@ -437,3 +414,58 @@ weekgrid:selected,
.week-header:selected {
border: solid 1px alpha(@theme_selected_bg_color, 0.8);
}
+
+
+/*
+ * Month cell
+ */
+
+monthcell {
+ border: solid 1px @borders;
+ border-width: 1px 0 0 1px;
+ background: transparent;
+ padding: 1px 0 1px 0;
+ transition: background-color 200ms;
+}
+
+monthcell:selected {
+ font-weight: bold;
+ background-color: alpha(@theme_selected_bg_color, 0.1);
+}
+
+monthcell.today {
+ background-color: alpha(@theme_selected_bg_color, 0.25);
+}
+
+monthcell:selected.today {
+ background-color: alpha(@theme_selected_bg_color, 0.33);
+}
+
+monthcell.out-of-month {
+ background-color: alpha(@theme_bg_color, 0.4);
+}
+
+monthcell label {
+ color: @theme_fg_color;
+ font-size: 0.9rem;
+}
+
+monthcell:hover:not(.out-of-month) {
+ background-color: @theme_bg_color;
+ transition: background-color 200ms;
+}
+
+monthcell:dir(ltr):nth-child(7n + 1) {
+ border-left-width: 0;
+}
+
+monthcell:dir(rtl):nth-child(7n + 1) {
+ border-right-width: 0;
+}
+
+monthcell button {
+ padding: 0 4px;
+ border-radius: 0;
+ border-bottom: none;
+ border-right: none;
+}
diff --git a/data/ui/month-cell.ui b/data/ui/month-cell.ui
new file mode 100644
index 0000000..b7b5681
--- /dev/null
+++ b/data/ui/month-cell.ui
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <template class="GcalMonthCell" parent="GtkEventBox">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="expand">True</property>
+ <signal name="enter-notify-event" handler="enter_notify_event_cb" object="GcalMonthCell" swapped="no" />
+ <signal name="leave-notify-event" handler="leave_notify_event_cb" object="GcalMonthCell" swapped="no" />
+ <child>
+ <object class="GtkOverlay" id="overlay">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+
+ <!-- HACK: in Gtk3, insensitive widgets receive no events. We "fix" this
+ limitation by adding an always-sensitive GtkEventBox above the event,
+ and when the event is insensitive, the event box's event window is
+ above it -->
+ <child type="overlay">
+ <object class="GtkEventBox" id="button_event_box">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="above-child" bind-source="overflow_button" bind-property="sensitive"
bind-flags="default|invert-boolean|sync-create" />
+ <signal name="enter-notify-event" handler="enter_notify_event_cb" object="GcalMonthCell"
swapped="no" />
+ <signal name="leave-notify-event" handler="leave_notify_event_cb" object="GcalMonthCell"
swapped="no" />
+ <child>
+ <object class="GtkButton" id="overflow_button">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="valign">end</property>
+ <property name="receives-default">True</property>
+ <signal name="clicked" handler="overflow_button_clicked_cb" object="GcalMonthCell"
swapped="no" />
+ <style>
+ <class name="flat" />
+ </style>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
+ <property name="valign">center</property>
+ <child type="center">
+ <object class="GtkLabel" id="overflow_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="ellipsize">end</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="day_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="weather_icon">
+ <property name="can-focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </template>
+</interface>
diff --git a/data/ui/month-view.ui b/data/ui/month-view.ui
new file mode 100644
index 0000000..b3488e5
--- /dev/null
+++ b/data/ui/month-view.ui
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <template class="GcalMonthView" parent="GtkContainer">
+
+ <!-- Header -->
+ <child type="header">
+ <object class="GtkBox">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">true</property>
+ <child>
+ <object class="GtkLabel" id="month_label">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="month-name" />
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="year_label">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">1.0</property>
+ <style>
+ <class name="secondary-label" />
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkBox">
+ <property name="visible">true</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">6</property>
+ <property name="margin-end">6</property>
+ <property name="margin-bottom">6</property>
+ <child>
+ <object class="GtkLabel" id="label_0">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkLabel" id="label_1">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkLabel" id="label_2">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkLabel" id="label_3">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkLabel" id="label_4">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkLabel" id="label_5">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkLabel" id="label_6">
+ <property name="visible">true</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">true</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="header" />
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+
+ </object>
+ </child>
+
+ <!-- Grid -->
+ <child type="grid">
+ <object class="GtkGrid" id="grid">
+ <property name="visible">true</property>
+ <property name="can-focus">false</property>
+ <property name="row-homogeneous">true</property>
+ <property name="column-homogeneous">true</property>
+ </object>
+ </child>
+ </template>
+
+ <!-- Overflow popover -->
+ <object class="GtkPopover" id="overflow_popover">
+ <property name="can-focus">false</property>
+ <property name="position">bottom</property>
+ <signal name="drag-motion" handler="cancel_dnd_from_overflow_popover" object="GcalMonthView"
swapped="yes" />
+ <style>
+ <class name="events" />
+ </style>
+
+ <child>
+ <object class="GtkBox">
+ <property name="visible">true</property>
+ <property name="can-focus">false</property>
+ <property name="spacing">6</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="popover_title">
+ <property name="visible">true</property>
+ <property name="can-focus">false</property>
+ <property name="margin-top">6</property>
+ <property name="margin-start">6</property>
+ <property name="margin-end">6</property>
+ <property name="xalign">0.0</property>
+ <style>
+ <class name="sidebar-header" />
+ </style>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">true</property>
+ <property name="can-focus">false</property>
+ <property name="hscrollbar-policy">never</property>
+ <property name="vscrollbar-policy">automatic</property>
+ <property name="max-content-height">400</property>
+ <property name="propagate-natural-height">true</property>
+ <child>
+ <object class="GtkBox" id="events_box">
+ <property name="visible">true</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-start">2</property>
+ <property name="margin-end">2</property>
+ <property name="spacing">2</property>
+ </object>
+ </child>
+ </object>
+ </child>
+
+ <child>
+ <object class="GtkButton">
+ <property name="visible">true</property>
+ <property name="hexpand">true</property>
+ <property name="label" translatable="yes">Add Event…</property>
+ <signal name="clicked" handler="add_new_event_button_cb" object="GcalMonthView" swapped="no" />
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/data/ui/week-header.ui b/data/ui/week-header.ui
index 322a542..fbf001f 100644
--- a/data/ui/week-header.ui
+++ b/data/ui/week-header.ui
@@ -17,7 +17,7 @@
<property name="label">Month</property>
<property name="yalign">0</property>
<style>
- <class name="start-header" />
+ <class name="primary-label" />
</style>
</object>
</child>
@@ -29,7 +29,7 @@
<property name="yalign">0</property>
<property name="label">Week</property>
<style>
- <class name="end-header" />
+ <class name="secondary-label" />
</style>
</object>
</child>
@@ -39,7 +39,7 @@
<property name="label">Year</property>
<property name="yalign">0</property>
<style>
- <class name="end-header" />
+ <class name="secondary-label" />
</style>
</object>
</child>
diff --git a/src/gcal-utils.c b/src/gcal-utils.c
index 3611731..1642a3c 100644
--- a/src/gcal-utils.c
+++ b/src/gcal-utils.c
@@ -1401,3 +1401,37 @@ filter_event_list_by_uid_and_modtype (GList *widgets,
return result;
}
+
+gboolean
+gcal_translate_child_window_position (GtkWidget *target,
+ GdkWindow *child_window,
+ gdouble src_x,
+ gdouble src_y,
+ gdouble *real_x,
+ gdouble *real_y)
+{
+ GdkWindow *window;
+ gdouble x, y;
+
+ x = src_x;
+ y = src_y;
+
+ /* Find the (x, y) values relative to the workbench */
+ window = child_window;
+ while (window && window != gtk_widget_get_window (target))
+ {
+ gdk_window_coords_to_parent (window, x, y, &x, &y);
+ window = gdk_window_get_parent (window);
+ }
+
+ if (!window)
+ return FALSE;
+
+ if (real_x)
+ *real_x = x;
+
+ if (real_y)
+ *real_y = y;
+
+ return TRUE;
+}
diff --git a/src/gcal-utils.h b/src/gcal-utils.h
index 94ab46e..1ed7547 100644
--- a/src/gcal-utils.h
+++ b/src/gcal-utils.h
@@ -162,4 +162,10 @@ GList* filter_event_list_by_uid_and_modtype (GList
GcalRecurrenceModType mod,
const gchar *uid);
+gboolean gcal_translate_child_window_position (GtkWidget *target,
+ GdkWindow *child_window,
+ gdouble src_x,
+ gdouble src_y,
+ gdouble *real_x,
+ gdouble *real_y);
#endif // __GCAL_UTILS_H__
diff --git a/src/meson.build b/src/meson.build
index 0291b3f..b5a29e2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,6 +18,7 @@ gcal_deps = [
]
sources = files(
+ 'views/gcal-month-cell.c',
'views/gcal-month-view.c',
'views/gcal-range-tree.c',
'views/gcal-view.c',
diff --git a/src/views/gcal-month-cell.c b/src/views/gcal-month-cell.c
new file mode 100644
index 0000000..d9246ff
--- /dev/null
+++ b/src/views/gcal-month-cell.c
@@ -0,0 +1,616 @@
+/* gcal-month-cell.c
+ *
+ * Copyright (C) 2017 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#define G_LOG_DOMAIN "GcalMonthCell"
+
+#include "config.h"
+#include "gcal-event-widget.h"
+#include "gcal-utils.h"
+#include "gcal-month-cell.h"
+
+struct _GcalMonthCell
+{
+ GtkEventBox parent;
+
+ GDateTime *date;
+ guint n_overflow;
+
+ GtkLabel *day_label;
+ GtkWidget *overflow_button;
+ GtkWidget *overflow_label;
+ GtkWidget *overlay;
+
+ gboolean different_month;
+ gboolean selected;
+
+ /* internal fields */
+ gboolean hovered : 1;
+ gboolean pressed : 1;
+
+ GcalManager *manager;
+};
+
+G_DEFINE_TYPE (GcalMonthCell, gcal_month_cell, GTK_TYPE_EVENT_BOX)
+
+enum
+{
+ SHOW_OVERFLOW,
+ N_SIGNALS
+};
+
+enum
+{
+ PROP_0,
+ PROP_MANAGER,
+ N_PROPS
+};
+
+static guint signals[N_SIGNALS] = { 0, };
+static GParamSpec *properties[N_PROPS] = { 0, };
+
+
+/*
+ * Auxiliary methods
+ */
+
+static void
+update_style_flags (GcalMonthCell *self)
+{
+ g_autoptr (GDateTime) today;
+ GtkStyleContext *context;
+ GtkStateFlags flags;
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET (self);
+ flags = gtk_widget_get_state_flags (widget);
+
+ if (self->hovered)
+ flags |= GTK_STATE_FLAG_PRELIGHT;
+ else
+ flags &= ~GTK_STATE_FLAG_PRELIGHT;
+
+ gtk_widget_set_state_flags (widget, flags, TRUE);
+
+ /* Today */
+ today = g_date_time_new_now_local ();
+ context = gtk_widget_get_style_context (GTK_WIDGET (self));
+
+ if (datetime_compare_date (self->date, today) == 0)
+ gtk_style_context_add_class (context, "today");
+ else
+ gtk_style_context_remove_class (context, "today");
+}
+
+static gboolean
+should_propagate_button_event (GtkWidget *widget,
+ GdkEventButton *event_button)
+{
+ GcalMonthCell *self;
+ gdouble x, y;
+ gint button_height, height;
+
+ self = GCAL_MONTH_CELL (widget);
+ height = gtk_widget_get_allocated_height (widget);
+ button_height = gtk_widget_get_allocated_height (self->overflow_button);
+
+ x = event_button->x;
+ y = event_button->y;
+
+ if (!gcal_translate_child_window_position (widget, event_button->window, x, y, &x, &y))
+ return GDK_EVENT_PROPAGATE;
+
+ if (self->n_overflow > 0 && y > height - button_height)
+ return GDK_EVENT_STOP;
+
+ return GDK_EVENT_PROPAGATE;
+}
+
+
+/*
+ * Callbacks
+ */
+
+static void
+day_changed_cb (GcalClock *clock,
+ GcalMonthCell *self)
+{
+ update_style_flags (self);
+}
+
+static gboolean
+enter_notify_event_cb (GtkWidget *widget,
+ GdkEventCrossing *event_crossing,
+ GcalMonthCell *self)
+{
+ self->hovered = TRUE;
+
+ update_style_flags (self);
+
+ return GDK_EVENT_PROPAGATE;
+}
+
+static gboolean
+leave_notify_event_cb (GtkWidget *widget,
+ GdkEventCrossing *event_crossing,
+ GcalMonthCell *self)
+{
+ self->hovered = FALSE;
+
+ update_style_flags (self);
+
+ return GDK_EVENT_PROPAGATE;
+}
+
+static void
+overflow_button_clicked_cb (GtkWidget *button,
+ GcalMonthCell *self)
+{
+ g_signal_emit (self, signals[SHOW_OVERFLOW], 0, button);
+}
+
+/*
+ * GtkWidget overrides
+ */
+static gboolean
+gcal_month_cell_drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
+{
+ GcalMonthCell *self;
+
+ self = GCAL_MONTH_CELL (widget);
+
+ if (self->different_month)
+ gtk_drag_unhighlight (widget);
+ else
+ gtk_drag_highlight (widget);
+
+ gdk_drag_status (context, self->different_month ? 0 : GDK_ACTION_MOVE, time);
+
+ return !self->different_month;
+}
+
+static gboolean
+gcal_month_cell_drag_drop (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
+{
+ GcalRecurrenceModType mod;
+ GcalMonthCell *self;
+ GtkWidget *event_widget;
+ GDateTime *start_dt, *end_dt;
+ GcalEvent *event;
+ ESource *source;
+ gint diff;
+ gint start_month, current_month;
+ gint start_year, current_year;
+ GTimeSpan timespan = 0;
+
+ self = GCAL_MONTH_CELL (widget);
+ event_widget = gtk_drag_get_source_widget (context);
+ mod = GCAL_RECURRENCE_MOD_THIS_ONLY;
+
+ if (!GCAL_IS_EVENT_WIDGET (event_widget))
+ return FALSE;
+
+ if (self->different_month)
+ return FALSE;
+
+ event = gcal_event_widget_get_event (GCAL_EVENT_WIDGET (event_widget));
+ source = gcal_event_get_source (event);
+
+ if (gcal_event_has_recurrence (event) &&
+ !ask_recurrence_modification_type (widget, &mod, source))
+ {
+ goto out;
+ }
+
+ /* Move the event's date */
+ start_dt = gcal_event_get_date_start (event);
+ end_dt = gcal_event_get_date_end (event);
+
+ start_month = g_date_time_get_month (start_dt);
+ start_year = g_date_time_get_year (start_dt);
+
+ current_month = g_date_time_get_month (self->date);
+ current_year = g_date_time_get_year (self->date);
+
+ timespan = g_date_time_difference (end_dt, start_dt);
+
+ start_dt = g_date_time_add_full (start_dt,
+ current_year - start_year,
+ current_month - start_month,
+ 0, 0, 0, 0);
+
+ diff = g_date_time_get_day_of_month (self->date) - g_date_time_get_day_of_month (start_dt);
+
+ if (diff != 0 ||
+ current_month != start_month ||
+ current_year != start_year)
+ {
+ g_autoptr (GDateTime) new_start;
+
+ new_start = g_date_time_add_days (start_dt, diff);
+
+ gcal_event_set_date_start (event, new_start);
+
+ /* The event may have a NULL end date, so we have to check it here */
+ if (end_dt)
+ {
+ GDateTime *new_end = g_date_time_add (new_start, timespan);
+
+ gcal_event_set_date_end (event, new_end);
+ g_clear_pointer (&new_end, g_date_time_unref);
+ }
+
+ gcal_manager_update_event (self->manager, event, mod);
+ }
+
+ g_clear_pointer (&start_dt, g_date_time_unref);
+
+out:
+ /* Cancel the DnD */
+ gtk_drag_unhighlight (widget);
+ gtk_drag_finish (context, TRUE, FALSE, time);
+
+ return TRUE;
+}
+
+static void
+gcal_month_cell_drag_leave (GtkWidget *widget,
+ GdkDragContext *context,
+ guint time)
+{
+ gtk_drag_unhighlight (widget);
+}
+
+static gboolean
+gcal_month_cell_button_press_event (GtkWidget *widget,
+ GdkEventButton *event_button)
+{
+ GcalMonthCell *self = GCAL_MONTH_CELL (widget);
+
+ self->pressed = TRUE;
+
+ return should_propagate_button_event (widget, event_button);
+}
+
+static gboolean
+gcal_month_cell_button_release_event (GtkWidget *widget,
+ GdkEventButton *event_button)
+{
+ GcalMonthCell *self = GCAL_MONTH_CELL (widget);
+
+ if (!self->pressed)
+ return GDK_EVENT_STOP;
+
+ self->pressed = FALSE;
+
+ return should_propagate_button_event (widget, event_button);
+}
+
+static gboolean
+gcal_month_cell_draw (GtkWidget *widget,
+ cairo_t *cr)
+{
+ GtkStyleContext *context;
+ gint width, height;
+
+ width = gtk_widget_get_allocated_width (widget);
+ height = gtk_widget_get_allocated_height (widget);
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_render_background (context, cr, 0, 0, width, height);
+ gtk_render_frame (context, cr, 0, 0, width, height);
+
+ if (gtk_widget_has_focus (widget))
+ gtk_render_focus (context, cr, 0, 0, width, height);
+
+ return GTK_WIDGET_CLASS (gcal_month_cell_parent_class)->draw (widget, cr);
+}
+
+
+/*
+ * GObject overrides
+ */
+
+static void
+gcal_month_cell_finalize (GObject *object)
+{
+ GcalMonthCell *self = (GcalMonthCell *)object;
+
+ gcal_clear_datetime (&self->date);
+ g_clear_object (&self->manager);
+
+ G_OBJECT_CLASS (gcal_month_cell_parent_class)->finalize (object);
+}
+
+
+static void
+gcal_month_cell_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GcalMonthCell *self = (GcalMonthCell *) object;
+
+ switch (property_id)
+ {
+ case PROP_MANAGER:
+ gcal_month_cell_set_manager (self, g_value_get_object (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gcal_month_cell_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GcalMonthCell *self = (GcalMonthCell *) object;
+
+ switch (property_id)
+ {
+ case PROP_MANAGER:
+ g_value_set_object (value, self->manager);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gcal_month_cell_class_init (GcalMonthCellClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->finalize = gcal_month_cell_finalize;
+ object_class->set_property = gcal_month_cell_set_property;
+ object_class->get_property = gcal_month_cell_get_property;
+
+ widget_class->button_press_event = gcal_month_cell_button_press_event;
+ widget_class->button_release_event = gcal_month_cell_button_release_event;
+ widget_class->drag_motion = gcal_month_cell_drag_motion;
+ widget_class->drag_drop = gcal_month_cell_drag_drop;
+ widget_class->drag_leave = gcal_month_cell_drag_leave;
+ widget_class->draw = gcal_month_cell_draw;
+
+ signals[SHOW_OVERFLOW] = g_signal_new ("show-overflow",
+ GCAL_TYPE_MONTH_CELL,
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 1,
+ GTK_TYPE_WIDGET);
+
+ properties[PROP_MANAGER] = g_param_spec_object ("manager",
+ "Manager",
+ "The GcalManager of the application",
+ GCAL_TYPE_MANAGER,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+ g_object_class_install_properties (object_class, N_PROPS, properties);
+
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/month-cell.ui");
+
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, day_label);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, overflow_button);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, overflow_label);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, overlay);
+
+ gtk_widget_class_bind_template_callback (widget_class, enter_notify_event_cb);
+ gtk_widget_class_bind_template_callback (widget_class, leave_notify_event_cb);
+ gtk_widget_class_bind_template_callback (widget_class, overflow_button_clicked_cb);
+
+ gtk_widget_class_set_css_name (widget_class, "monthcell");
+}
+
+static void
+gcal_month_cell_init (GcalMonthCell *self)
+{
+ gtk_widget_init_template (GTK_WIDGET (self));
+
+
+ /* Setup the month cell as a drag n' drop destination */
+ gtk_drag_dest_set (GTK_WIDGET (self),
+ 0,
+ NULL,
+ 0,
+ GDK_ACTION_MOVE);
+}
+
+GtkWidget*
+gcal_month_cell_new (void)
+{
+ return g_object_new (GCAL_TYPE_MONTH_CELL, NULL);
+}
+
+
+GDateTime*
+gcal_month_cell_get_date (GcalMonthCell *self)
+{
+ g_return_val_if_fail (GCAL_IS_MONTH_CELL (self), NULL);
+
+ return self->date;
+}
+
+void
+gcal_month_cell_set_date (GcalMonthCell *self,
+ GDateTime *date)
+{
+ g_autofree gchar *text = NULL;
+
+ g_return_if_fail (GCAL_IS_MONTH_CELL (self));
+
+ gcal_clear_datetime (&self->date);
+ self->date = g_date_time_ref (date);
+
+ /* Day label */
+ text = g_strdup_printf ("%d", g_date_time_get_day_of_month (date));
+
+ gtk_label_set_text (self->day_label, text);
+ update_style_flags (self);
+}
+
+gboolean
+gcal_month_cell_get_different_month (GcalMonthCell *self)
+{
+ g_return_val_if_fail (GCAL_IS_MONTH_CELL (self), FALSE);
+
+ return self->different_month;
+}
+
+void
+gcal_month_cell_set_different_month (GcalMonthCell *self,
+ gboolean different)
+{
+ GtkStyleContext *context;
+
+ g_return_if_fail (GCAL_IS_MONTH_CELL (self));
+
+ if (self->different_month == different)
+ return;
+
+ self->different_month = different;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (self));
+
+ if (different)
+ gtk_style_context_add_class (context, "out-of-month");
+ else
+ gtk_style_context_remove_class (context, "out-of-month");
+}
+
+GcalManager*
+gcal_month_cell_get_manager (GcalMonthCell *self)
+{
+ g_return_val_if_fail (GCAL_IS_MONTH_CELL (self), NULL);
+
+ return self->manager;
+}
+
+void
+gcal_month_cell_set_manager (GcalMonthCell *self,
+ GcalManager *manager)
+{
+ g_return_if_fail (GCAL_IS_MONTH_CELL (self));
+
+ if (g_set_object (&self->manager, manager))
+ {
+ g_signal_connect_swapped (gcal_manager_get_clock (manager),
+ "day-changed",
+ G_CALLBACK (day_changed_cb),
+ self);
+
+ g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MANAGER]);
+ }
+}
+
+guint
+gcal_month_cell_get_overflow (GcalMonthCell *self)
+{
+ g_return_val_if_fail (GCAL_IS_MONTH_CELL (self), 0);
+
+ return self->n_overflow;
+}
+
+void
+gcal_month_cell_set_overflow (GcalMonthCell *self,
+ guint n_overflow)
+{
+ g_autofree gchar *text = NULL;
+
+ g_return_if_fail (GCAL_IS_MONTH_CELL (self));
+
+ gtk_widget_set_visible (self->overflow_label, n_overflow > 0);
+ gtk_widget_set_sensitive (self->overflow_button, n_overflow > 0);
+
+ if (self->n_overflow == n_overflow)
+ return;
+
+ self->n_overflow = n_overflow;
+
+ text = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "Other event", "Other %d events", n_overflow),
n_overflow);
+ gtk_label_set_text (GTK_LABEL (self->overflow_label), text);
+}
+
+gint
+gcal_month_cell_get_real_height (GcalMonthCell *self)
+{
+ GtkStyleContext *context;
+ GtkBorder padding;
+ GtkBorder border;
+
+ g_return_val_if_fail (GCAL_IS_MONTH_CELL (self), -1);
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (self));
+ gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
+ gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border);
+
+ return gtk_widget_get_allocated_height (GTK_WIDGET (self)) -
+ gtk_widget_get_allocated_height (self->overflow_button) -
+ padding.top - padding.bottom -
+ border.top - border.bottom;
+}
+
+gboolean
+gcal_month_cell_get_selected (GcalMonthCell *self)
+{
+ g_return_val_if_fail (GCAL_IS_MONTH_CELL (self), FALSE);
+
+ return self->selected;
+}
+
+void
+gcal_month_cell_set_selected (GcalMonthCell *self,
+ gboolean selected)
+{
+ GtkStateFlags flags;
+
+ g_return_if_fail (GCAL_IS_MONTH_CELL (self));
+
+ if (self->selected == selected)
+ return;
+
+ self->selected = selected;
+
+ /* Update style context state */
+ flags = gtk_widget_get_state_flags (GTK_WIDGET (self));
+
+ if (selected)
+ flags |= GTK_STATE_FLAG_SELECTED;
+ else
+ flags &= ~GTK_STATE_FLAG_SELECTED;
+
+ gtk_widget_set_state_flags (GTK_WIDGET (self), flags, TRUE);
+
+ gtk_widget_queue_resize (GTK_WIDGET (self));
+}
diff --git a/src/views/gcal-month-cell.h b/src/views/gcal-month-cell.h
new file mode 100644
index 0000000..ccea347
--- /dev/null
+++ b/src/views/gcal-month-cell.h
@@ -0,0 +1,64 @@
+/* gcal-month-cell.h
+ *
+ * Copyright (C) 2017 Georges Basile Stavracas Neto <georges stavracas gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GCAL_MONTH_CELL_H
+#define GCAL_MONTH_CELL_H
+
+#include "gcal-manager.h"
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GCAL_TYPE_MONTH_CELL (gcal_month_cell_get_type())
+
+G_DECLARE_FINAL_TYPE (GcalMonthCell, gcal_month_cell, GCAL, MONTH_CELL, GtkEventBox)
+
+GtkWidget* gcal_month_cell_new (void);
+
+GDateTime* gcal_month_cell_get_date (GcalMonthCell *self);
+
+void gcal_month_cell_set_date (GcalMonthCell *self,
+ GDateTime *date);
+
+gboolean gcal_month_cell_get_different_month (GcalMonthCell *self);
+
+void gcal_month_cell_set_different_month (GcalMonthCell *self,
+ gboolean out);
+
+GcalManager* gcal_month_cell_get_manager (GcalMonthCell *self);
+
+void gcal_month_cell_set_manager (GcalMonthCell *self,
+ GcalManager *manager);
+
+guint gcal_month_cell_get_overflow (GcalMonthCell *self);
+
+void gcal_month_cell_set_overflow (GcalMonthCell *self,
+ guint n_overflow);
+
+gint gcal_month_cell_get_real_height (GcalMonthCell *self);
+
+gboolean gcal_month_cell_get_selected (GcalMonthCell *self);
+
+void gcal_month_cell_set_selected (GcalMonthCell *self,
+ gboolean selected);
+
+G_END_DECLS
+
+#endif /* GCAL_MONTH_VIEW_CELL_H */
+
diff --git a/src/views/gcal-month-view.c b/src/views/gcal-month-view.c
index 08090b1..a397cff 100644
--- a/src/views/gcal-month-view.c
+++ b/src/views/gcal-month-view.c
@@ -27,6 +27,7 @@
#include "e-cal-data-model-subscriber.h"
#include "gcal-debug.h"
+#include "gcal-month-cell.h"
#include "gcal-month-view.h"
#include "gcal-utils.h"
#include "gcal-view.h"
@@ -39,104 +40,119 @@
struct _GcalMonthView
{
- GtkContainer parent;
-
- GtkWidget *overflow_popover;
- GtkWidget *events_list_box;
- GtkWidget *popover_title;
-
- GdkWindow *event_window;
+ GtkContainer parent;
+
+ GtkWidget *events_box;
+ GtkWidget *overflow_popover;
+ GtkWidget *popover_title;
+
+ GdkWindow *event_window;
+
+ /* Header widgets */
+ GtkWidget *header;
+ GtkWidget *label_0;
+ GtkWidget *label_1;
+ GtkWidget *label_2;
+ GtkWidget *label_3;
+ GtkWidget *label_4;
+ GtkWidget *label_5;
+ GtkWidget *label_6;
+ GtkWidget *month_label;
+ GtkWidget *year_label;
+ GtkWidget *weekday_label[7];
+
+ /* Grid widgets */
+ GtkWidget *grid;
+ GtkWidget *month_cell[6][7];
/*
* Hash to keep children widgets (all of them, parent widgets and its parts if there's any),
* uuid as key and a list of all the instances of the event as value. Here, the first widget
* on the list is the master, and the rest are the parts. Note: the master is a part itself.
*/
- GHashTable *children;
+ GHashTable *children;
/*
* Hash containig single-cell events, day of the month, on month-view, month of the year on
* year-view as key anda list of the events that belongs to this cell
*/
- GHashTable *single_cell_children;
+ GHashTable *single_cell_children;
/*
* A sorted list containig multiday events. This one contains only parents events, to find out
* its parts @children will be used.
*/
- GList *multi_cell_children;
+ GList *multi_cell_children;
/*
* Hash containing cells that who has overflow per list of hidden widgets.
*/
- GHashTable *overflow_cells;
+ GHashTable *overflow_cells;
/*
* Set containing the master widgets hidden for delete;
*/
- GHashTable *hidden_as_overflow;
+ GHashTable *hidden_as_overflow;
/* state flags */
- gboolean children_changed;
+ gboolean children_changed;
/*
* the cell on which its drawn the first day of the month, in the first row, 0 for the first
* cell, 1 for the second, and so on, this takes first_weekday into account already.
*/
- gint days_delay;
+ gint days_delay;
/*
* The cell whose keyboard focus is on.
*/
- gint keyboard_cell;
+ gint keyboard_cell;
/*
* first day of the week according to user locale, being
* 0 for Sunday, 1 for Monday and so on */
- gint first_weekday;
+ gint first_weekday;
/*
* The start & end dates of the selection. We use datetimes to allow the user to navigate between
* months using the keyboard.
*/
- GDateTime *start_mark_cell;
- GDateTime *end_mark_cell;
+ GDateTime *start_mark_cell;
+ GDateTime *end_mark_cell;
/*
- * This flags signals when the cursor is over an overflow indicator and when once has been clicked
- */
- gint pressed_overflow_indicator;
- gint hovered_overflow_indicator;
-
- /**
* clock format from GNOME desktop settings
*/
- gboolean use_24h_format;
+ gboolean use_24h_format;
/* text direction factors */
- gboolean k;
+ gboolean k;
/* The cell hovered during Drag and Drop */
- gint dnd_cell;
+ gint dnd_cell;
/* Storage for the accumulated scrolling */
- gdouble scroll_value;
+ gdouble scroll_value;
/* property */
- icaltimetype *date;
- GcalManager *manager;
+ icaltimetype *date;
+ GcalManager *manager;
};
#define MIRROR(val,start,end) (start + (val / end) * end + (end - val % end))
-static void gcal_view_interface_init (GcalViewInterface *iface);
+static void gcal_view_interface_init (GcalViewInterface *iface);
+
+static void gtk_buildable_interface_init (GtkBuildableIface *iface);
static void e_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GcalMonthView, gcal_month_view, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init)
G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
- e_data_model_subscriber_interface_init));
+ e_data_model_subscriber_interface_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+ gtk_buildable_interface_init));
enum
{
@@ -154,6 +170,11 @@ enum
static guint signals[NUM_SIGNALS] = { 0, };
+
+/*
+ * Auxiliary functions
+ */
+
static inline gint
real_cell (gint cell,
gboolean rtl)
@@ -176,9 +197,6 @@ event_activated (GcalEventWidget *widget,
GcalMonthView *self)
{
cancel_selection (self);
-
- self->pressed_overflow_indicator = -1;
-
gtk_widget_hide (self->overflow_popover);
g_signal_emit (self, signals[EVENT_ACTIVATED], 0, widget);
@@ -203,429 +221,401 @@ setup_child_widget (GcalMonthView *self,
g_signal_connect (widget, "show", G_CALLBACK (event_visibility_changed), self);
}
-static gdouble
-get_start_grid_y (GtkWidget *widget)
+static gboolean
+emit_create_event (GcalMonthView *self)
{
- GtkStyleContext* context;
- GtkStateFlags state_flags;
- gint padding_top;
+ GtkAllocation alloc;
+ GDateTime *end_dt,*start_dt;
+ gboolean should_clear_end;
+ gdouble x, y;
+ gint cell;
+
+ GCAL_ENTRY;
- PangoLayout *layout;
- PangoFontDescription *font_desc;
- gint font_height;
- gdouble start_grid_y;
+ if (!self->end_mark_cell)
+ GCAL_RETURN (FALSE);
- context = gtk_widget_get_style_context (widget);
- state_flags = gtk_style_context_get_state (context);
+ should_clear_end = FALSE;
+ start_dt = self->start_mark_cell;
+ end_dt = self->end_mark_cell;
- layout = gtk_widget_create_pango_layout (widget, NULL);
+ /* Swap dates if start > end */
+ if (g_date_time_compare (start_dt, end_dt) > 0)
+ {
+ GDateTime *aux;
+ aux = start_dt;
+ start_dt = end_dt;
+ end_dt = aux;
+ }
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "start-header");
- gtk_style_context_get (context, state_flags, "padding-top", &padding_top, "font", &font_desc, NULL);
+ /* Only setup an end date when days are different */
+ if (!g_date_time_equal (start_dt, end_dt))
+ {
+ GDateTime *tmp_dt;
- pango_layout_set_font_description (layout, font_desc);
- pango_layout_get_pixel_size (layout, NULL, &font_height);
+ tmp_dt = g_date_time_new_local (g_date_time_get_year (end_dt),
+ g_date_time_get_month (end_dt),
+ g_date_time_get_day_of_month (end_dt),
+ 0, 0, 0);
+ end_dt = g_date_time_add_days (tmp_dt, 1);
+
+ should_clear_end = TRUE;
+
+ g_clear_pointer (&tmp_dt, g_date_time_unref);
+ }
- pango_font_description_free (font_desc);
- gtk_style_context_restore (context);
+ /* Get the corresponding GcalMonthCell */
+ cell = g_date_time_get_day_of_month (self->end_mark_cell) + self->days_delay - 1;
- start_grid_y = 2 * padding_top + font_height;
+ gtk_widget_get_allocation (self->month_cell[cell / 7][cell % 7], &alloc);
- gtk_style_context_get (context, state_flags, "font", &font_desc, "padding-top", &padding_top, NULL);
+ x = alloc.x + alloc.width / 2.0;
+ y = alloc.y + alloc.height / 2.0;
- pango_layout_set_font_description (layout, font_desc);
- pango_layout_get_pixel_size (layout, NULL, &font_height);
+ g_signal_emit_by_name (self, "create-event", start_dt, end_dt, x, y);
- start_grid_y += padding_top + font_height;
+ if (should_clear_end)
+ g_clear_pointer (&end_dt, g_date_time_unref);
- pango_font_description_free (font_desc);
- g_object_unref (layout);
- return start_grid_y;
+ GCAL_RETURN (TRUE);
}
-static void
-get_cell_position (GcalMonthView *self,
- gint cell,
- gdouble *out_x,
- gdouble *out_y)
+static GtkWidget*
+get_month_cell_at_position (GcalMonthView *self,
+ gdouble x,
+ gdouble y,
+ gint *cell)
{
- GtkWidget *widget;
-
- gdouble start_grid_y;
+ gint i;
- gint shown_rows;
- gdouble first_row_gap;
+ if (y < gtk_widget_get_allocated_height (self->header))
+ return NULL;
- gdouble cell_width;
- gdouble cell_height;
+ for (i = 0; i < 42; i++)
+ {
+ GtkAllocation alloc;
+ guint row, col;
- widget = GTK_WIDGET (self);
+ row = i / 7;
+ col = i % 7;
- start_grid_y = get_start_grid_y (widget);
+ gtk_widget_get_allocation (self->month_cell[row][col], &alloc);
- shown_rows = ceil ((self->days_delay + icaltime_days_in_month (self->date->month, self->date->year)) /
7.0);
- first_row_gap = (6 - shown_rows) * 0.5; /* invalid area before the actual rows */
+ if (x >= alloc.x && x < alloc.x + alloc.width &&
+ y >= alloc.y && y < alloc.y + alloc.height)
+ {
+ if (cell)
+ *cell = i;
- cell_width = gtk_widget_get_allocated_width (widget) / 7.0;
- cell_height = (gtk_widget_get_allocated_height (widget) - start_grid_y) / 6.0;
+ return self->month_cell[row][col];
+ }
+ }
- if (out_x != NULL)
- *out_x = cell_width * ((cell % 7) + 0.5);
+ if (cell)
+ *cell = -1;
- if (out_y != NULL)
- *out_y = cell_height * ((cell / 7) + first_row_gap + 0.5) + start_grid_y;
+ return NULL;
}
-static void
-rebuild_popover_for_day (GcalMonthView *self,
- GDateTime *day)
-{
- PangoLayout *overflow_layout;
- PangoFontDescription *ofont_desc;
- GtkStyleContext *context;
- GtkStateFlags state;
- GdkRectangle rect;
- GtkWidget *child_widget;
- GList *l;
- gdouble start_grid_y, cell_width, cell_height;
- gchar *label_title;
- gint shown_rows;
- gint real_clicked_popover_cell;
- gint font_height, padding_bottom;
- label_title = g_date_time_format (day, _("%B %d"));
- gtk_label_set_text (GTK_LABEL (self->popover_title), label_title);
- g_free (label_title);
+static gboolean
+get_widget_parts (gint first_cell,
+ gint last_cell,
+ gint natural_height,
+ gdouble *vertical_cell_space,
+ gdouble *size_left,
+ GArray *cells,
+ GArray *lengths)
+{
+ gdouble old_y;
+ gdouble y;
+ gint current_part_length;
+ gint i;
- /* Clean all the widgets */
- gtk_container_foreach (GTK_CONTAINER (self->events_list_box), (GtkCallback) gtk_widget_destroy, NULL);
+ old_y = -1.0;
+ current_part_length = 0;
- l = g_hash_table_lookup (self->overflow_cells, GINT_TO_POINTER (self->pressed_overflow_indicator));
+ if (last_cell < first_cell)
+ {
+ gint swap = last_cell;
+ last_cell = first_cell;
+ first_cell = swap;
+ }
- /* Setup the start & end dates of the events as the begin & end of day */
- if (l)
+ for (i = first_cell; i <= last_cell; i++)
{
- for (; l != NULL; l = g_list_next (l))
+ if (size_left[i] < natural_height)
+ return FALSE;
+
+ y = vertical_cell_space[i] - size_left[i];
+
+ if (old_y == -1.0 || y != old_y)
{
- GtkWidget *cloned_event;
- GDateTime *current_date;
- GDateTime *dt_start;
- GDateTime *dt_end;
- GcalEvent *event;
- GTimeZone *tz;
+ current_part_length = 1;
+ g_array_append_val (cells, i);
+ g_array_append_val (lengths, current_part_length);
+ old_y = y;
+ }
+ else
+ {
+ current_part_length++;
+ g_array_index (lengths, gint, lengths->len - 1) = current_part_length;
+ }
+ }
- event = gcal_event_widget_get_event (l->data);
+ return TRUE;
+}
- if (gcal_event_get_all_day (event))
- tz = g_time_zone_new_utc ();
- else
- tz = g_time_zone_new_local ();
+static void
+show_overflow_popover_cb (GcalMonthCell *cell,
+ GtkWidget *button,
+ GcalMonthView *self)
+{
+ g_autofree gchar *label_title = NULL;
+ GtkWidget *child_widget;
+ GDateTime *dt;
+ GList *l;
+ gint day, cell_nr;
- current_date = icaltime_to_datetime (self->date);
- dt_start = g_date_time_new (tz,
- g_date_time_get_year (current_date),
- g_date_time_get_month (current_date),
- g_date_time_get_day_of_month (day),
- 0, 0, 0);
+ dt = gcal_month_cell_get_date (cell);
+ day = g_date_time_get_day_of_month (dt);
+ cell_nr = day + self->days_delay - 1;
- dt_end = g_date_time_add_days (dt_start, 1);
+ if (!g_hash_table_contains (self->overflow_cells, GINT_TO_POINTER (cell_nr)))
+ {
+ g_critical ("No overflow events for day %d. Something is wrong.", cell_nr);
+ return;
+ }
- cloned_event = gcal_event_widget_clone (l->data);
- gcal_event_widget_set_date_start (GCAL_EVENT_WIDGET (cloned_event), dt_start);
- gcal_event_widget_set_date_end (GCAL_EVENT_WIDGET (cloned_event), dt_end);
+ /* Popover title */
+ label_title = g_date_time_format (dt, _("%B %d"));
+ gtk_label_set_text (GTK_LABEL (self->popover_title), label_title);
- gtk_container_add (GTK_CONTAINER (self->events_list_box), cloned_event);
- setup_child_widget (self, cloned_event);
+ /* Clean all the widgets */
+ gtk_container_foreach (GTK_CONTAINER (self->events_box), (GtkCallback) gtk_widget_destroy, NULL);
- g_clear_pointer (¤t_date, g_date_time_unref);
- g_clear_pointer (&dt_start, g_date_time_unref);
- g_clear_pointer (&dt_end, g_date_time_unref);
- g_clear_pointer (&tz, g_time_zone_unref);
- }
- }
+ l = g_hash_table_lookup (self->overflow_cells, GINT_TO_POINTER (cell_nr));
- /* placement calculation */
- start_grid_y = get_start_grid_y (GTK_WIDGET (self));
- shown_rows = ceil ((self->days_delay + icaltime_days_in_month (self->date->month, self->date->year)) /
7.0);
+ /* Setup the start & end dates of the events as the begin & end of day */
+ for (; l != NULL; l = g_list_next (l))
+ {
+ g_autoptr (GDateTime) current_date = NULL;
+ g_autoptr (GDateTime) dt_start = NULL;
+ g_autoptr (GDateTime) dt_end = NULL;
+ g_autoptr (GTimeZone) tz = NULL;
+ GtkWidget *cloned_event;
+ GcalEvent *event;
- cell_width = gtk_widget_get_allocated_width (GTK_WIDGET (self)) / 7.0;
- cell_height = (gtk_widget_get_allocated_height (GTK_WIDGET (self)) - start_grid_y) / 6.0;
+ event = gcal_event_widget_get_event (l->data);
- context = gtk_widget_get_style_context (GTK_WIDGET (self));
- state = gtk_style_context_get_state (context);
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "overflow");
- gtk_style_context_get (context, state, "font", &ofont_desc, "padding-bottom", &padding_bottom, NULL);
+ if (gcal_event_get_all_day (event))
+ tz = g_time_zone_new_utc ();
+ else
+ tz = g_time_zone_new_local ();
- overflow_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), NULL);
- pango_layout_set_font_description (overflow_layout, ofont_desc);
- pango_layout_get_pixel_size (overflow_layout, NULL, &font_height);
+ current_date = icaltime_to_datetime (self->date);
+ dt_start = g_date_time_new (tz,
+ g_date_time_get_year (current_date),
+ g_date_time_get_month (current_date),
+ day, 0, 0, 0);
- gtk_style_context_restore (context);
- pango_font_description_free (ofont_desc);
- g_object_unref (overflow_layout);
+ dt_end = g_date_time_add_days (dt_start, 1);
- real_clicked_popover_cell = real_cell (self->pressed_overflow_indicator, self->k);
- rect.y = cell_height * ((real_clicked_popover_cell / 7) + 1.0 + (6 - shown_rows) * 0.5) + start_grid_y -
padding_bottom - font_height / 2;
- rect.width = 1;
- rect.height = 1;
+ cloned_event = gcal_event_widget_clone (l->data);
+ gcal_event_widget_set_date_start (GCAL_EVENT_WIDGET (cloned_event), dt_start);
+ gcal_event_widget_set_date_end (GCAL_EVENT_WIDGET (cloned_event), dt_end);
- if (real_clicked_popover_cell % 7 < 3)
- {
- rect.x = cell_width * ((real_clicked_popover_cell % 7) + 1.0);
- gtk_popover_set_position (GTK_POPOVER (self->overflow_popover), self->k ? GTK_POS_LEFT :
GTK_POS_RIGHT);
- }
- else if (real_clicked_popover_cell % 7 > 3)
- {
- rect.x = cell_width * ((real_clicked_popover_cell % 7));
- gtk_popover_set_position (GTK_POPOVER (self->overflow_popover), self->k ? GTK_POS_RIGHT :
GTK_POS_LEFT);
+ gtk_container_add (GTK_CONTAINER (self->events_box), cloned_event);
+ setup_child_widget (self, cloned_event);
}
- else
- {
- rect.x = cell_width * ((real_clicked_popover_cell % 7) + 1.0 - self->k);
- gtk_popover_set_position (GTK_POPOVER (self->overflow_popover), GTK_POS_RIGHT);
- }
- gtk_popover_set_pointing_to (GTK_POPOVER (self->overflow_popover), &rect);
+
+ gtk_popover_set_relative_to (GTK_POPOVER (self->overflow_popover), button);
/* sizing hack */
child_widget = gtk_bin_get_child (GTK_BIN (self->overflow_popover));
gtk_widget_set_size_request (child_widget, 200, -1);
+ gtk_widget_show_all (child_widget);
g_object_set_data (G_OBJECT (self->overflow_popover),
"selected-day",
- GINT_TO_POINTER (g_date_time_get_day_of_month (day)));
+ GINT_TO_POINTER (day));
+
+ gtk_popover_popup (GTK_POPOVER (self->overflow_popover));
+
+ cancel_selection (self);
}
-static gboolean
-show_popover_for_position (GcalMonthView *self,
- gdouble x,
- gdouble y,
- gboolean on_indicator)
+static void
+setup_header_widget (GcalMonthView *self,
+ GtkWidget *widget)
{
- GtkWidget *widget;
- GDateTime *end_dt,*start_dt;
+ self->header = widget;
+ gtk_widget_set_parent (widget, GTK_WIDGET (self));
+}
- widget = GTK_WIDGET (self);
- start_dt = self->start_mark_cell;
- end_dt = self->end_mark_cell;
+static void
+setup_month_grid (GcalMonthView *self,
+ GtkWidget *widget)
+{
+ guint row, col;
- if (self->start_mark_cell == NULL)
- return FALSE;
+ self->grid = widget;
+ gtk_widget_set_parent (widget, GTK_WIDGET (self));
- if (self->pressed_overflow_indicator != -1 &&
- g_date_time_equal (start_dt, end_dt) &&
- g_hash_table_contains (self->overflow_cells, GINT_TO_POINTER (self->pressed_overflow_indicator)))
+ for (row = 0; row < 6; row++)
{
- self->hovered_overflow_indicator = self->pressed_overflow_indicator;
-
- rebuild_popover_for_day (GCAL_MONTH_VIEW (widget), end_dt);
- gtk_widget_show_all (self->overflow_popover);
-
- gtk_widget_queue_draw (widget);
- self->pressed_overflow_indicator = -1;
-
- cancel_selection (GCAL_MONTH_VIEW (widget));
- return TRUE;
- }
- else
- {
- gboolean should_clear_end = FALSE;
-
- /* Swap dates if start > end */
- if (g_date_time_compare (start_dt, end_dt) > 0)
+ for (col = 0; col < 7; col++)
{
- GDateTime *aux;
- aux = start_dt;
- start_dt = end_dt;
- end_dt = aux;
- }
+ GtkWidget *cell;
- /* Only setup an end date when days are different */
- if (!g_date_time_equal (start_dt, end_dt))
- {
- GDateTime *tmp_dt;
+ cell = gcal_month_cell_new ();
- tmp_dt = g_date_time_new_local (g_date_time_get_year (end_dt),
- g_date_time_get_month (end_dt),
- g_date_time_get_day_of_month (end_dt),
- 0, 0, 0);
- end_dt = g_date_time_add_days (tmp_dt, 1);
+ g_signal_connect (cell,
+ "show-overflow",
+ G_CALLBACK (show_overflow_popover_cb),
+ self);
- should_clear_end = TRUE;
+ self->month_cell[row][col] = cell;
- g_clear_pointer (&tmp_dt, g_date_time_unref);
+ gtk_grid_attach (GTK_GRID (widget), cell, col, row, 1, 1);
}
-
- g_signal_emit_by_name (GCAL_VIEW (widget), "create-event", start_dt, end_dt, x, y);
-
- if (should_clear_end)
- g_clear_pointer (&end_dt, g_date_time_unref);
}
-
- gtk_widget_queue_draw (widget);
- self->pressed_overflow_indicator = -1;
-
- return FALSE;
}
-static gint
-gather_button_event_data (GcalMonthView *self,
- gdouble x,
- gdouble y,
- gboolean *out_on_indicator,
- gdouble *out_x,
- gdouble *out_y)
+static void
+update_month_cells (GcalMonthView *self)
{
- GtkWidget *widget;
-
- gdouble start_grid_y;
+ g_autoptr (GDateTime) dt;
+ guint row, col;
- gint shown_rows;
- gdouble first_row_gap;
+ dt = g_date_time_new_local (self->date->year, self->date->month, 1, 0, 0, 0);
- gdouble cell_width;
- gdouble cell_height;
+ for (row = 0; row < 6; row++)
+ {
+ for (col = 0; col < 7; col++)
+ {
+ g_autoptr (GDateTime) cell_date = NULL;
+ GcalMonthCell *cell;
+ GDateTime *selection_start;
+ GDateTime *selection_end;
+ GList *l;
+ gboolean different_month;
+ gboolean selected;
+ guint day;
- gint cell;
+ cell = GCAL_MONTH_CELL (self->month_cell[row][col]);
+ day = row * 7 + col;
+ selected = FALSE;
+ l = NULL;
- GtkStyleContext *context;
- GtkStateFlags state;
+ /* Cell date */
+ cell_date = g_date_time_add_days (dt, row * 7 + col - self->days_delay);
+ gcal_month_cell_set_date (cell, cell_date);
- PangoLayout *overflow_layout;
- PangoFontDescription *ofont_desc;
- gint font_height, padding_bottom, padding_top;
+ /* Different month */
+ different_month = day < self->days_delay ||
+ day - self->days_delay >= icaltime_days_in_month (self->date->month,
self->date->year);
- widget = GTK_WIDGET (self);
+ gcal_month_cell_set_different_month (cell, different_month);
- start_grid_y = get_start_grid_y (widget);
+ if (different_month)
+ {
+ gcal_month_cell_set_selected (cell, FALSE);
+ gcal_month_cell_set_overflow (cell, 0);
+ continue;
+ }
- shown_rows = ceil ((self->days_delay + icaltime_days_in_month (self->date->month, self->date->year)) /
7.0);
- first_row_gap = (6 - shown_rows) * 0.5; /* invalid area before the actual rows */
+ /* Overflow */
+ if (g_hash_table_contains (self->overflow_cells, GINT_TO_POINTER (day)))
+ l = g_hash_table_lookup (self->overflow_cells, GINT_TO_POINTER (day));
- cell_width = gtk_widget_get_allocated_width (widget) / 7.0;
- cell_height = (gtk_widget_get_allocated_height (widget) - start_grid_y) / 6.0;
+ gcal_month_cell_set_overflow (cell, l ? g_list_length (l) : 0);
- context = gtk_widget_get_style_context (widget);
- state = gtk_style_context_get_state (context);
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "overflow");
- gtk_style_context_get (context, state,
- "font", &ofont_desc,
- "padding-bottom", &padding_bottom,
- "padding-top", &padding_top,
- NULL);
+ /* Selection */
+ selection_start = self->start_mark_cell;
+ selection_end = self->end_mark_cell;
- overflow_layout = gtk_widget_create_pango_layout (widget, NULL);
- pango_layout_set_font_description (overflow_layout, ofont_desc);
- pango_layout_get_pixel_size (overflow_layout, NULL, &font_height);
+ if (selection_start || selection_end)
+ {
+ if (!selection_end)
+ selection_end = selection_start;
- gtk_style_context_restore (context);
- pango_font_description_free (ofont_desc);
- g_object_unref (overflow_layout);
+ /* Swap dates if end is before start */
+ if (datetime_compare_date (selection_end, selection_start) < 0)
+ {
+ GDateTime *aux = selection_end;
+ selection_end = selection_start;
+ selection_start = aux;
+ }
- y = y - start_grid_y - first_row_gap * cell_height;
+ selected = datetime_compare_date (gcal_month_cell_get_date (cell), selection_start) >= 0 &&
+ datetime_compare_date (gcal_month_cell_get_date (cell), selection_end) <= 0;
+ }
- /* When we're dealing with 5-row months, the first_row_gap
- * is never big enought, and (gint)(y / cell_height) always
- * rounds to 0, resulting in a valid cell number when it is
- * actually invalid.
- */
- cell = y < 0 ? -1 : 7 * (gint)(y / cell_height) + (gint)(x / cell_width);
+ gcal_month_cell_set_selected (cell, selected);
- if (out_on_indicator != NULL)
- {
- gdouble upper_border = cell_height * ((gint) y / (gint) cell_height);
- y = y - upper_border;
+ /* Drag n' Drop */
+ if (self->dnd_cell != row * 7 + col)
+ gtk_drag_unhighlight (GTK_WIDGET (cell));
- *out_on_indicator = (cell_height - font_height - padding_bottom - padding_top < y && y < cell_height);
+ gtk_widget_queue_draw (GTK_WIDGET (cell));
+ }
}
+}
- if (out_x != NULL)
- *out_x = cell_width * ((cell % 7) + 0.5);
+static void
+update_header_labels (GcalMonthView *self)
+{
+ gchar year_str[10] = { 0, };
- if (out_y != NULL)
- *out_y = cell_height * ((cell / 7) + first_row_gap + 0.5) + start_grid_y;
+ g_snprintf (year_str, 10, "%d", self->date->year);
- return cell;
+ gtk_label_set_label (GTK_LABEL (self->month_label), gcal_get_month_name (self->date->month - 1));
+ gtk_label_set_label (GTK_LABEL (self->year_label), year_str);
}
-static gboolean
-get_widget_parts (gint first_cell,
- gint last_cell,
- gint natural_height,
- gdouble vertical_cell_space,
- gdouble *size_left,
- GArray *cells,
- GArray *lengths)
+static inline void
+update_weekday_labels (GcalMonthView *self)
{
- gdouble old_y;
- gdouble y;
- gint current_part_length;
gint i;
- old_y = -1.0;
- current_part_length = 0;
-
- if (last_cell < first_cell)
- {
- gint swap = last_cell;
- last_cell = first_cell;
- first_cell = swap;
- }
-
- for (i = first_cell; i <= last_cell; i++)
+ for (i = 0; i < 7; i++)
{
- if (size_left[i] < natural_height)
- return FALSE;
+ g_autofree gchar *weekday_name;
- y = vertical_cell_space - size_left[i];
+ weekday_name = g_utf8_strup (gcal_get_weekday ((i + self->first_weekday) % 7), -1);
- if (old_y == -1.0 || y != old_y)
- {
- current_part_length = 1;
- g_array_append_val (cells, i);
- g_array_append_val (lengths, current_part_length);
- old_y = y;
- }
- else
- {
- current_part_length++;
- g_array_index (lengths, gint, lengths->len - 1) = current_part_length;
- }
+ gtk_label_set_label (GTK_LABEL (self->weekday_label[i]), weekday_name);
}
-
- return TRUE;
}
-static void
-overflow_popover_hide (GtkWidget *widget,
- gpointer user_data)
-{
- GcalMonthView *self = GCAL_MONTH_VIEW (widget);
-
- self->hovered_overflow_indicator = -1;
- gtk_widget_queue_draw (widget);
-}
+/*
+ * GtkWidget overrides
+ */
static gboolean
gcal_month_view_key_press (GtkWidget *widget,
GdkEventKey *event)
{
GcalMonthView *self;
- gboolean selection, valid_key;
- gdouble x, y;
+ gboolean create_event;
+ gboolean selection;
+ gboolean valid_key;
+ gboolean is_ltr;
gint min, max, diff, month_change, current_day;
+ gint row, col;
g_return_val_if_fail (GCAL_IS_MONTH_VIEW (widget), FALSE);
self = GCAL_MONTH_VIEW (widget);
selection = event->state & GDK_SHIFT_MASK;
+ create_event = FALSE;
valid_key = FALSE;
diff = 0;
month_change = 0;
current_day = self->keyboard_cell - self->days_delay + 1;
min = self->days_delay;
max = self->days_delay + icaltime_days_in_month (self->date->month, self->date->year) - 1;
+ is_ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
/*
* If it's starting the selection right now, it should mark the current keyboard
@@ -649,12 +639,12 @@ gcal_month_view_key_press (GtkWidget *widget,
case GDK_KEY_Left:
valid_key = TRUE;
- diff = self->k ? 1 : -1;
+ diff = is_ltr ? -1 : 1;
break;
case GDK_KEY_Right:
valid_key = TRUE;
- diff = self->k ? -1 : 1;
+ diff = is_ltr ? 1 : -1;
break;
case GDK_KEY_Return:
@@ -662,11 +652,10 @@ gcal_month_view_key_press (GtkWidget *widget,
* If it's not on the selection mode (i.e. shift is not pressed), we should
* simulate it by changing the start & end selected cells = keyboard cell.
*/
- if (!selection && self->start_mark_cell == NULL && self->end_mark_cell == NULL)
+ if (!selection && !self->start_mark_cell && !self->end_mark_cell)
self->start_mark_cell = self->end_mark_cell = g_date_time_new_local (self->date->year,
self->date->month, current_day, 0, 0, 0);
- get_cell_position (GCAL_MONTH_VIEW (widget), real_cell (current_day + self->days_delay - 1, self->k),
&x, &y);
- show_popover_for_position (GCAL_MONTH_VIEW (widget), x, y, FALSE);
+ create_event = TRUE;
break;
case GDK_KEY_Escape:
@@ -674,7 +663,7 @@ gcal_month_view_key_press (GtkWidget *widget,
break;
default:
- return FALSE;
+ return GDK_EVENT_PROPAGATE;
}
if (self->keyboard_cell + diff <= max && self->keyboard_cell + diff >= min)
@@ -702,8 +691,22 @@ gcal_month_view_key_press (GtkWidget *widget,
self->keyboard_cell = self->days_delay + icaltime_days_in_month (self->date->month,
self->date->year) - min + self->keyboard_cell + diff;
}
+ /* Focus the selected month cell */
+ row = self->keyboard_cell / 7;
+ col = self->keyboard_cell % 7;
+
+ gtk_widget_grab_focus (self->month_cell[row][col]);
+
current_day = self->keyboard_cell - self->days_delay + 1;
self->date->day = current_day;
+
+ /*
+ * We can only emit the :create-event signal ~after~ grabbing the focus, otherwise
+ * the popover is instantly hidden.
+ */
+ if (create_event)
+ emit_create_event (self);
+
g_object_notify (G_OBJECT (widget), "active-date");
if (selection)
@@ -716,178 +719,7 @@ gcal_month_view_key_press (GtkWidget *widget,
cancel_selection (GCAL_MONTH_VIEW (widget));
}
- gtk_widget_queue_draw (widget);
-
- return TRUE;
-}
-
-/*
- * Drag and Drop functions
- */
-static gint
-get_dnd_cell (GtkWidget *widget,
- gint x,
- gint y)
-{
- GcalMonthView *self;
- gint cell;
-
- self = GCAL_MONTH_VIEW (widget);
- cell = gather_button_event_data (GCAL_MONTH_VIEW (widget), x, y, NULL, NULL, NULL);
- cell = real_cell (cell, self->k);
-
- if (cell >= self->days_delay &&
- cell < g_date_get_days_in_month (self->date->month, self->date->year) + self->days_delay)
- {
- return cell;
- }
-
- return -1;
-}
-
-static gboolean
-gcal_month_view_drag_motion (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time)
-{
- GcalMonthView *self;
-
- self = GCAL_MONTH_VIEW (widget);
- self->dnd_cell = get_dnd_cell (widget, x, y);
-
- /* Setup the drag highlight */
- if (self->dnd_cell != -1)
- {
- gtk_drag_highlight (widget);
- gtk_widget_hide (self->overflow_popover);
- }
- else
- {
- gtk_drag_unhighlight (widget);
- }
-
- /*
- * Sets the status of the drag - if it fails, sets the action to 0 and
- * aborts the drag with FALSE.
- */
- gdk_drag_status (context,
- self->dnd_cell == -1 ? 0 : GDK_ACTION_MOVE,
- time);
-
- gtk_widget_queue_draw (widget);
-
- return self->dnd_cell != -1;
-}
-
-static gboolean
-gcal_month_view_drag_drop (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time)
-{
- GcalRecurrenceModType mod;
- GcalMonthView *self = GCAL_MONTH_VIEW (widget);
- GtkWidget *event_widget;
- GDateTime *start_dt, *end_dt, *current_dt;
- GcalEvent *event;
- ESource *source;
- gint cell, diff;
- gint start_month, current_month;
- gint start_year, current_year;
- GTimeSpan timespan = 0;
-
- cell = get_dnd_cell (widget, x, y);
- event_widget = gtk_drag_get_source_widget (context);
- mod = GCAL_RECURRENCE_MOD_THIS_ONLY;
-
- if (!GCAL_IS_EVENT_WIDGET (event_widget))
- return FALSE;
-
- event = gcal_event_widget_get_event (GCAL_EVENT_WIDGET (event_widget));
- source = gcal_event_get_source (event);
-
- if (gcal_event_has_recurrence (event) &&
- !ask_recurrence_modification_type (widget, &mod, source))
- {
- goto out;
- }
-
- /* Move the event's date */
- start_dt = gcal_event_get_date_start (event);
- end_dt = gcal_event_get_date_end (event);
-
- start_month = g_date_time_get_month (start_dt);
- start_year = g_date_time_get_year (start_dt);
-
- current_dt = icaltime_to_datetime (self->date);
-
- current_month = g_date_time_get_month (current_dt);
- current_year = g_date_time_get_year (current_dt);
-
- g_clear_pointer (¤t_dt, g_date_time_unref);
-
- if (end_dt)
- timespan = g_date_time_difference (end_dt, start_dt);
-
- start_dt = g_date_time_add_full (start_dt,
- current_year - start_year,
- current_month - start_month,
- 0, 0, 0, 0);
-
- diff = cell - self->days_delay - g_date_time_get_day_of_month (start_dt) + 1;
- if (diff != 0 ||
- current_month != start_month ||
- current_year != start_year)
- {
- GDateTime *new_start = g_date_time_add_days (start_dt, diff);
-
- gcal_event_set_date_start (event, new_start);
-
- /* The event may have a NULL end date, so we have to check it here */
- if (end_dt)
- {
- GDateTime *new_end = g_date_time_add (new_start, timespan);
-
- gcal_event_set_date_end (event, new_end);
- g_clear_pointer (&new_end, g_date_time_unref);
- }
-
- gcal_manager_update_event (self->manager, event, mod);
-
- g_clear_pointer (&new_start, g_date_time_unref);
-
- self->children_changed = TRUE;
- }
-
- g_clear_pointer (&start_dt, g_date_time_unref);
-
-out:
- /* Cancel the DnD */
- self->dnd_cell = -1;
- gtk_drag_unhighlight (widget);
-
- gtk_drag_finish (context, TRUE, FALSE, time);
-
- gtk_widget_queue_draw (widget);
-
- return TRUE;
-}
-
-static void
-gcal_month_view_drag_leave (GtkWidget *widget,
- GdkDragContext *context,
- guint time)
-{
- GcalMonthView *self = GCAL_MONTH_VIEW (widget);
-
- /* Cancel the drag */
- self->dnd_cell = -1;
- gtk_drag_unhighlight (widget);
-
- gtk_widget_queue_draw (widget);
+ return GDK_EVENT_STOP;
}
static gboolean
@@ -970,7 +802,9 @@ gcal_month_view_set_date (GcalView *view,
GCAL_TRACE_MSG ("new date: %s", icaltime_as_ical_string (*date));
self->children_changed = TRUE;
- gtk_widget_queue_resize (GTK_WIDGET (view));
+
+ update_header_labels (self);
+ update_month_cells (self);
GCAL_EXIT;
}
@@ -979,8 +813,9 @@ static void
gcal_month_view_clear_marks (GcalView *view)
{
cancel_selection (GCAL_MONTH_VIEW (view));
+ update_month_cells (GCAL_MONTH_VIEW (view));
- gtk_widget_queue_draw (GTK_WIDGET (view));
+ gtk_widget_queue_allocate (GTK_WIDGET (view));
}
static GList*
@@ -1013,6 +848,33 @@ gcal_view_interface_init (GcalViewInterface *iface)
iface->get_children_by_uuid = gcal_month_view_get_children_by_uuid;
}
+
+/*
+ * GtkBuildable interface
+ */
+
+static void
+gcal_month_view_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
+{
+ GcalMonthView *self = GCAL_MONTH_VIEW (buildable);
+
+ if (type && strcmp (type, "header") == 0)
+ setup_header_widget (self, GTK_WIDGET (child));
+ else if (type && strcmp (type, "grid") == 0)
+ setup_month_grid (self, GTK_WIDGET (child));
+ else
+ GTK_BUILDER_WARN_INVALID_CHILD_TYPE (buildable, type);
+}
+
+static void
+gtk_buildable_interface_init (GtkBuildableIface *iface)
+{
+ iface->add_child = gcal_month_view_add_child;
+}
+
/*
* ECalDataModelSubscriber interface
*/
@@ -1031,7 +893,7 @@ gcal_month_view_component_added (ECalDataModelSubscriber *subscriber,
if (error)
{
- g_message ("Error creating event: %s", error->message);
+ g_warning ("Error creating event: %s", error->message);
g_clear_error (&error);
return;
}
@@ -1042,6 +904,8 @@ gcal_month_view_component_added (ECalDataModelSubscriber *subscriber,
gtk_widget_show (event_widget);
gtk_container_add (GTK_CONTAINER (subscriber), event_widget);
+ update_month_cells (GCAL_MONTH_VIEW (subscriber));
+
g_clear_object (&event);
}
@@ -1051,10 +915,10 @@ gcal_month_view_component_modified (ECalDataModelSubscriber *subscriber,
ECalComponent *comp)
{
GcalMonthView *self;
- GList *l;
GtkWidget *new_widget;
GcalEvent *event;
GError *error;
+ GList *l;
error = NULL;
self = GCAL_MONTH_VIEW (subscriber);
@@ -1062,7 +926,7 @@ gcal_month_view_component_modified (ECalDataModelSubscriber *subscriber,
if (error)
{
- g_message ("Error creating event: %s", error->message);
+ g_warning ("Error creating event: %s", error->message);
g_clear_error (&error);
return;
}
@@ -1071,7 +935,7 @@ gcal_month_view_component_modified (ECalDataModelSubscriber *subscriber,
l = g_hash_table_lookup (self->children, gcal_event_get_uid (event));
- if (l != NULL)
+ if (l)
{
gtk_widget_destroy (l->data);
@@ -1086,6 +950,8 @@ gcal_month_view_component_modified (ECalDataModelSubscriber *subscriber,
gtk_widget_destroy (new_widget);
}
+ update_month_cells (self);
+
g_clear_object (&event);
}
@@ -1096,8 +962,8 @@ gcal_month_view_component_removed (ECalDataModelSubscriber *subscriber,
const gchar *rid)
{
GcalMonthView *self;
+ g_autofree gchar *uuid = NULL;
const gchar *sid;
- gchar *uuid;
GList *l;
self = GCAL_MONTH_VIEW (subscriber);
@@ -1109,17 +975,18 @@ gcal_month_view_component_removed (ECalDataModelSubscriber *subscriber,
uuid = g_strdup_printf ("%s:%s", sid, uid);
l = g_hash_table_lookup (self->children, uuid);
- if (l != NULL)
- {
- gtk_widget_destroy (l->data);
- }
- else
+
+ if (!l)
{
g_warning ("%s: Widget with uuid: %s not found in view: %s",
- G_STRFUNC, uuid, gtk_widget_get_name (GTK_WIDGET (subscriber)));
+ G_STRFUNC,
+ uuid,
+ gtk_widget_get_name (GTK_WIDGET (subscriber)));
+ return;
}
- g_free (uuid);
+ gtk_widget_destroy (l->data);
+ update_month_cells (self);
}
static void
@@ -1204,7 +1071,8 @@ gcal_month_view_add (GtkContainer *container,
if (gcal_event_is_multiday (event))
{
- self->multi_cell_children = g_list_insert_sorted (self->multi_cell_children, widget,
+ self->multi_cell_children = g_list_insert_sorted (self->multi_cell_children,
+ widget,
(GCompareFunc) gcal_event_widget_sort_events);
}
else
@@ -1217,9 +1085,8 @@ gcal_month_view_add (GtkContainer *container,
l = g_list_insert_sorted (l, widget, (GCompareFunc) gcal_event_widget_compare_by_start_date);
if (g_list_length (l) != 1)
- {
- g_hash_table_steal (self->single_cell_children, GINT_TO_POINTER (cell_idx));
- }
+ g_hash_table_steal (self->single_cell_children, GINT_TO_POINTER (cell_idx));
+
g_hash_table_insert (self->single_cell_children, GINT_TO_POINTER (cell_idx), l);
}
@@ -1238,11 +1105,15 @@ gcal_month_view_remove (GtkContainer *container,
g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container));
+ if (!GCAL_IS_EVENT_WIDGET (widget))
+ goto out;
+
self = GCAL_MONTH_VIEW (container);
event = gcal_event_widget_get_event (GCAL_EVENT_WIDGET (widget));
uuid = gcal_event_get_uid (event);
l = g_hash_table_lookup (self->children, uuid);
+
if (l)
{
self->children_changed = TRUE;
@@ -1319,9 +1190,10 @@ gcal_month_view_remove (GtkContainer *container,
g_hash_table_replace (self->children, g_strdup (uuid), l);
g_hash_table_remove (self->hidden_as_overflow, uuid);
-
- gtk_widget_queue_resize (GTK_WIDGET (container));
}
+
+out:
+ gtk_widget_queue_resize (GTK_WIDGET (container));
}
static void
@@ -1334,6 +1206,16 @@ gcal_month_view_forall (GtkContainer *container,
GList *l, *l2, *aux = NULL;
self = GCAL_MONTH_VIEW (container);
+
+ /* Header */
+ if (self->header)
+ (*callback) (self->header, callback_data);
+
+ /* Header */
+ if (self->grid)
+ (*callback) (self->grid, callback_data);
+
+ /* Event widgets */
l2 = g_hash_table_get_values (self->children);
for (l = l2; l != NULL; l = g_list_next (l))
@@ -1365,6 +1247,7 @@ gcal_month_view_set_property (GObject *object,
GParamSpec *pspec)
{
GcalMonthView *self = (GcalMonthView *) object;
+ gint i;
switch (property_id)
{
@@ -1380,6 +1263,9 @@ gcal_month_view_set_property (GObject *object,
G_CALLBACK (gtk_widget_queue_draw),
self);
+ for (i = 0; i < 42; i++)
+ gcal_month_cell_set_manager (GCAL_MONTH_CELL (self->month_cell[i / 7][i % 7]), self->manager);
+
g_object_notify (object, "manager");
break;
@@ -1444,8 +1330,7 @@ gcal_month_view_realize (GtkWidget *widget)
gtk_widget_set_realized (widget, TRUE);
parent_window = gtk_widget_get_parent_window (widget);
- gtk_widget_set_window (widget, parent_window);
- g_object_ref (parent_window);
+ gtk_widget_set_window (widget, g_object_ref (parent_window));
gtk_widget_get_allocation (widget, &allocation);
@@ -1478,7 +1363,7 @@ gcal_month_view_unrealize (GtkWidget *widget)
{
GcalMonthView *self = GCAL_MONTH_VIEW (widget);
- if (self->event_window != NULL)
+ if (self->event_window)
{
gtk_widget_unregister_window (widget, self->event_window);
gdk_window_destroy (self->event_window);
@@ -1493,7 +1378,7 @@ gcal_month_view_map (GtkWidget *widget)
{
GcalMonthView *self = GCAL_MONTH_VIEW (widget);
- if (self->event_window != NULL)
+ if (self->event_window)
gdk_window_show (self->event_window);
GTK_WIDGET_CLASS (gcal_month_view_parent_class)->map (widget);
@@ -1504,40 +1389,63 @@ gcal_month_view_unmap (GtkWidget *widget)
{
GcalMonthView *self = GCAL_MONTH_VIEW (widget);
- if (self->event_window != NULL)
+ if (self->event_window)
gdk_window_hide (self->event_window);
GTK_WIDGET_CLASS (gcal_month_view_parent_class)->unmap (widget);
}
static void
-gcal_month_view_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+remove_cell_border_and_padding (GtkWidget *cell,
+ gdouble *x,
+ gdouble *y,
+ gdouble *width)
{
- GtkStyleContext *context, *child_context;
- GcalMonthView *self;
+ GtkStyleContext *cell_context;
+ GtkBorder cell_padding;
+ GtkBorder cell_border;
- gint i, j, sw, shown_rows;
+ cell_context = gtk_widget_get_style_context (cell);
+ gtk_style_context_get_border (cell_context, gtk_style_context_get_state (cell_context), &cell_border);
+ gtk_style_context_get_padding (cell_context, gtk_style_context_get_state (cell_context), &cell_padding);
- GtkBorder margin;
- gint padding_bottom, font_height;
- PangoLayout *layout;
- PangoFontDescription *font_desc;
+ if (x)
+ *x += cell_border.left + cell_padding.left;
- gdouble start_grid_y, first_row_gap, cell_width, cell_height, vertical_cell_space;
- gdouble pos_x, pos_y, size_left [42];
+ if (y)
+ *y += cell_border.top + cell_padding.top;
- const gchar *uuid;
- GtkWidget *child_widget;
- GtkAllocation child_allocation;
- gint natural_height;
+ if (width)
+ {
+ *width -= cell_border.left + cell_border.right;
+ *width -= cell_padding.left + cell_padding.right;
+ }
+}
- GList *widgets, *aux, *l = NULL;
+static void
+gcal_month_view_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkStyleContext *child_context;
GHashTableIter iter;
+ GtkAllocation child_allocation;
+ GtkAllocation cell_alloc;
+ GcalMonthView *self;
+ GtkWidget *child_widget;
+ GtkWidget *month_cell;
+ GtkBorder margin;
gpointer key, value;
+ GList *widgets, *aux, *l = NULL;
+ const gchar *uuid;
+ gdouble vertical_cell_space [42];
+ gdouble size_left [42];
+ gdouble pos_x, pos_y;
+ gint minimum_height;
+ gint header_height;
+ gint grid_height;
+ gint i, j, sw;
self = gcal_month_view_get_instance_private (GCAL_MONTH_VIEW (widget));
- context = gtk_widget_get_style_context (widget);
/* No need to relayout stuff if nothing changed */
if (!self->children_changed &&
@@ -1547,15 +1455,17 @@ gcal_month_view_size_allocate (GtkWidget *widget,
return;
}
- /* remove every widget' parts, but the master widget */
+ /* Remove every widget' parts, but the master widget */
widgets = g_hash_table_get_values (self->children);
+
for (aux = widgets; aux != NULL; aux = g_list_next (aux))
l = g_list_concat (l, g_list_copy (g_list_next (aux->data)));
+
g_list_free (widgets);
g_list_free_full (l, (GDestroyNotify) gtk_widget_destroy);
- /* clean overflow information */
+ /* Clean overflow information */
g_hash_table_remove_all (self->overflow_cells);
/* Allocate the widget */
@@ -1564,28 +1474,35 @@ gcal_month_view_size_allocate (GtkWidget *widget,
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (self->event_window, allocation->x, allocation->y, allocation->width,
allocation->height);
- gtk_style_context_get (context,
- gtk_style_context_get_state (context),
- "font", &font_desc,
- "padding-bottom", &padding_bottom,
- NULL);
+ /* Header */
+ gtk_widget_get_preferred_height (self->header, &header_height, NULL);
+
+ child_allocation.x = allocation->x;
+ child_allocation.y = allocation->y;
+ child_allocation.width = allocation->width;
+ child_allocation.height = header_height;
+
+ gtk_widget_size_allocate (self->header, &child_allocation);
+
+ /* Grid */
+ gtk_widget_get_preferred_height (self->grid, &grid_height, NULL);
- layout = gtk_widget_create_pango_layout (widget, _("Other events"));
- pango_layout_set_font_description (layout, font_desc);
- pango_layout_get_pixel_size (layout, NULL, &font_height);
- pango_font_description_free (font_desc);
- g_object_unref (layout);
+ child_allocation.x = allocation->x;
+ child_allocation.y = allocation->y + header_height;
+ child_allocation.width = allocation->width;
+ child_allocation.height = MAX (allocation->height - header_height, grid_height);
- start_grid_y = get_start_grid_y (widget);
- cell_width = allocation->width / 7.0;
- cell_height = (allocation->height - start_grid_y) / 6.0;
- vertical_cell_space = cell_height - (padding_bottom * 2 + font_height);
+ gtk_widget_size_allocate (self->grid, &child_allocation);
+ /* Event widgets */
for (i = 0; i < 42; i++)
- size_left[i] = vertical_cell_space;
+ {
+ gint h = gcal_month_cell_get_real_height (GCAL_MONTH_CELL (self->month_cell[i / 7][i % 7]));
+
+ vertical_cell_space[i] = h;
+ size_left[i] = h;
+ }
- shown_rows = ceil ((self->days_delay + icaltime_days_in_month (self->date->month, self->date->year)) /
7.0);
- first_row_gap = (6 - shown_rows) * 0.5;
sw = 1 - 2 * self->k;
/*
@@ -1595,12 +1512,11 @@ gcal_month_view_size_allocate (GtkWidget *widget,
*/
for (l = self->multi_cell_children; l != NULL; l = g_list_next (l))
{
- gint first_cell, last_cell, first_row, last_row, start, end;
- gboolean visible, all_day;
-
GDateTime *date;
GcalEvent *event;
GArray *cells, *lengths;
+ gboolean visible, all_day;
+ gint first_cell, last_cell, first_row, last_row, start, end;
child_widget = (GtkWidget*) l->data;
event = gcal_event_widget_get_event (l->data);
@@ -1612,7 +1528,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
continue;
gtk_widget_show (child_widget);
- gtk_widget_get_preferred_height (child_widget, NULL, &natural_height);
+ gtk_widget_get_preferred_height (child_widget, &minimum_height, NULL);
/*
* If the month of the event's start date is equal to the month
@@ -1623,8 +1539,11 @@ gcal_month_view_size_allocate (GtkWidget *widget,
date = gcal_event_get_date_start (event);
date = all_day ? g_date_time_ref (date) : g_date_time_to_local (date);
- if (g_date_time_get_month (date) == self->date->month)
- j = g_date_time_get_day_of_month (date);
+ if (g_date_time_get_year (date) == self->date->year &&
+ g_date_time_get_month (date) == self->date->month)
+ {
+ j = g_date_time_get_day_of_month (date);
+ }
j += self->days_delay;
@@ -1652,6 +1571,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
if (all_day)
j--;
}
+
j += self->days_delay;
g_clear_pointer (&date, g_date_time_unref);
@@ -1678,7 +1598,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
if (i == last_row)
end = last_cell;
- visible = get_widget_parts (start, end, natural_height, vertical_cell_space, size_left, cells,
lengths);
+ visible = get_widget_parts (start, end, minimum_height, vertical_cell_space, size_left, cells,
lengths);
}
if (visible)
@@ -1686,6 +1606,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
for (i = 0; i < cells->len; i++)
{
GDateTime *dt_start, *dt_end;
+ gdouble width;
gint cell_idx = g_array_index (cells, gint, i);
gint length = g_array_index (lengths, gint, i);
gint row = cell_idx / 7;
@@ -1709,8 +1630,15 @@ gcal_month_view_size_allocate (GtkWidget *widget,
aux = g_list_append (aux, child_widget);
}
- /* XXX: silence Gtk+ complaining about preferred size */
- gtk_widget_get_preferred_height (child_widget, NULL, &natural_height);
+ /* Retrieve the cell widget */
+ if (self->k)
+ month_cell = self->month_cell[row][6 - column];
+ else
+ month_cell = self->month_cell[row][column];
+
+ gtk_widget_get_allocation (month_cell, &cell_alloc);
+
+ gtk_widget_get_preferred_height (child_widget, &minimum_height, NULL);
/*
* Setup the widget's start date as the first day of the row,
@@ -1734,23 +1662,27 @@ gcal_month_view_size_allocate (GtkWidget *widget,
gtk_style_context_get_state (child_context),
&margin);
- pos_x = cell_width * column + margin.left;
- pos_y = cell_height * (row + first_row_gap) + start_grid_y + margin.top;
- /* TODO: find a better way to take the lines into account */
- pos_y += 2;
+ pos_x = cell_alloc.x + margin.left;
+ pos_y = cell_alloc.y + margin.top;
+ width = cell_alloc.width * length;
+
+ remove_cell_border_and_padding (month_cell, &pos_x, &pos_y, &width);
child_allocation.x = pos_x;
- child_allocation.y = pos_y + vertical_cell_space - size_left[cell_idx];
- child_allocation.width = cell_width * length - (margin.left + margin.right);
- child_allocation.height = natural_height;
+ child_allocation.y = pos_y + vertical_cell_space[cell_idx] - size_left[cell_idx];
+ child_allocation.width = width - (margin.left + margin.right);
+ child_allocation.height = minimum_height;
gtk_widget_size_allocate (child_widget, &child_allocation);
g_hash_table_remove (self->hidden_as_overflow, uuid);
/* update size_left */
for (j = 0; j < length; j++)
- size_left[cell_idx + j] -= natural_height + margin.top + margin.bottom;
+ {
+ size_left[cell_idx + j] -= minimum_height;
+ size_left[cell_idx + j] -= margin.top + margin.bottom;
+ }
g_clear_pointer (&dt_start, g_date_time_unref);
g_clear_pointer (&dt_end, g_date_time_unref);
@@ -1788,12 +1720,16 @@ gcal_month_view_size_allocate (GtkWidget *widget,
{
j = GPOINTER_TO_INT (key);
j += self->days_delay;
- i = 7 * ((j - 1) / 7)+ 6 * self->k + sw * ((j - 1) % 7);
+ i = 7 * ((j - 1) / 7) + 6 * self->k + sw * ((j - 1) % 7);
+
+ month_cell = self->month_cell[i / 7][i % 7];
+ gtk_widget_get_allocation (month_cell, &cell_alloc);
l = (GList*) value;
for (aux = l; aux != NULL; aux = g_list_next (aux))
{
GcalEvent *event;
+ gdouble width;
child_widget = aux->data;
event = gcal_event_widget_get_event (aux->data);
@@ -1803,29 +1739,29 @@ gcal_month_view_size_allocate (GtkWidget *widget,
continue;
gtk_widget_show (child_widget);
- gtk_widget_get_preferred_height (child_widget, NULL, &natural_height);
+ gtk_widget_get_preferred_height (child_widget, &minimum_height, NULL);
- if (size_left[i] > natural_height)
+ if (size_left[i] > minimum_height)
{
child_context = gtk_widget_get_style_context (child_widget);
gtk_style_context_get_margin (child_context, gtk_style_context_get_state (child_context),
&margin);
- pos_x = cell_width * (i % 7) + margin.left;
- pos_y = cell_height * ((i / 7) + first_row_gap) + start_grid_y + margin.top;
+ pos_x = cell_alloc.x + margin.left;
+ pos_y = cell_alloc.y + margin.top;
+ width = cell_alloc.width;
- /* TODO: find a better way to take the lines into account */
- pos_y += 2;
+ remove_cell_border_and_padding (month_cell, &pos_x, &pos_y, &width);
child_allocation.x = pos_x;
- child_allocation.y = pos_y + vertical_cell_space - size_left[i];
- child_allocation.width = cell_width - (margin.left + margin.right);
- child_allocation.height = natural_height;
+ child_allocation.y = pos_y + vertical_cell_space[i] - size_left[i];
+ child_allocation.width = width - (margin.left + margin.right);
+ child_allocation.height = minimum_height;
gtk_widget_show (child_widget);
gtk_widget_size_allocate (child_widget, &child_allocation);
g_hash_table_remove (self->hidden_as_overflow, uuid);
- size_left[i] -= natural_height + margin.top + margin.bottom;
+ size_left[i] -= minimum_height + margin.top + margin.bottom;
}
else
{
@@ -1843,588 +1779,30 @@ gcal_month_view_size_allocate (GtkWidget *widget,
}
}
- if (g_hash_table_size (self->overflow_cells) != 0)
- gtk_widget_queue_draw (widget);
+ update_month_cells (self);
self->children_changed = FALSE;
}
static gboolean
-gcal_month_view_draw (GtkWidget *widget,
- cairo_t *cr)
+gcal_month_view_button_press (GtkWidget *widget,
+ GdkEventButton *event)
{
GcalMonthView *self;
+ gdouble x, y;
+ gint days, clicked_cell;
- GtkStyleContext *context;
- GtkStateFlags state;
-
- GtkBorder padding;
- GtkAllocation alloc;
-
- GdkRGBA color;
-
- gchar *header_str;
- PangoLayout *layout;
- PangoFontDescription *font_desc, *sfont_desc;
-
- g_autoptr (GDateTime) today;
-
- gint font_width, font_height, pos_x, pos_y, shown_rows;
- gint i, j, sw, lower_mark = 43, upper_mark = -2;
- gint unused_start, unused_start_width;
- gint unused_end, unused_end_width;
- gdouble cell_width, cell_height;
- gdouble start_grid_y, first_row_gap = 0.0;
- gdouble days;
-
- gboolean is_ltr;
+ GCAL_ENTRY;
self = GCAL_MONTH_VIEW (widget);
-
- today = g_date_time_new_now_local ();
-
- is_ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
-
- /* fonts and colors selection */
- context = gtk_widget_get_style_context (widget);
- state = gtk_style_context_get_state (context);
-
- /* Get font description */
- gtk_style_context_save (context);
- gtk_style_context_set_state (context, state | GTK_STATE_FLAG_SELECTED);
- gtk_style_context_get (context, state | GTK_STATE_FLAG_SELECTED, "font", &sfont_desc, NULL);
- gtk_style_context_restore (context);
-
- gtk_widget_get_allocation (widget, &alloc);
- start_grid_y = get_start_grid_y (widget);
- cell_width = alloc.width / 7.0;
- cell_height = (alloc.height - start_grid_y) / 6.0;
-
- layout = gtk_widget_create_pango_layout (widget, NULL);
-
- /* calculations */
days = self->days_delay + icaltime_days_in_month (self->date->month, self->date->year);
- shown_rows = ceil (days / 7.0);
-
- first_row_gap = (6 - shown_rows) * 0.5; /* invalid area before the actual rows */
- sw = 1 - 2 * self->k;
-
- /* active cells */
- if (self->start_mark_cell && self->end_mark_cell)
- {
- gint start_year, end_year, start_month, end_month;
-
- upper_mark = g_date_time_get_day_of_month(self->end_mark_cell);
-
- start_year = g_date_time_get_year (self->start_mark_cell);
- end_year = g_date_time_get_year (self->end_mark_cell);
- start_month = g_date_time_get_month (self->start_mark_cell);
- end_month = g_date_time_get_month (self->end_mark_cell);
-
- if (start_year == end_year && start_month == end_month)
- {
- lower_mark = g_date_time_get_day_of_month(self->start_mark_cell);
- }
- else
- {
- if (start_year != end_year)
- lower_mark = start_year < end_year ? 1 : icaltime_days_in_month (end_month, end_year);
- else
- lower_mark = start_month < end_month ? 1 : icaltime_days_in_month (end_month, end_year);
- }
-
- if (lower_mark > upper_mark)
- {
- gint cell;
- cell = lower_mark;
- lower_mark = upper_mark;
- upper_mark = cell;
- }
- }
-
- /* view headers */
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "start-header");
-
- gtk_style_context_get (context, state, "font", &font_desc, NULL);
- gtk_style_context_get_padding (context, state, &padding);
-
- header_str = g_strdup_printf ("%s", gcal_get_month_name (self->date->month - 1));
- pango_layout_set_text (layout, header_str, -1);
- pango_layout_set_font_description (layout, font_desc);
- pango_layout_get_pixel_size (layout, &font_width, NULL);
-
- gtk_render_layout (context, cr, self->k * (alloc.width - font_width) + sw * padding.left, padding.top,
layout);
-
- pango_font_description_free (font_desc);
- g_free (header_str);
- gtk_style_context_restore (context);
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "end-header");
-
- gtk_style_context_get (context, state, "font", &font_desc, NULL);
- gtk_style_context_get_padding (context, state, &padding);
- header_str = g_strdup_printf ("%d", self->date->year);
- pango_layout_set_text (layout, header_str, -1);
- pango_layout_set_font_description (layout, font_desc);
- pango_layout_get_pixel_size (layout, &font_width, NULL);
+ /* The event may have come from a child widget, so make it relative to the month view */
+ if (!gcal_translate_child_window_position (widget, event->window, event->x, event->y, &x, &y))
+ return GDK_EVENT_PROPAGATE;
- gtk_render_layout (context, cr, (1 - self->k) * (alloc.width - font_width) - sw * padding.left,
padding.top, layout);
+ get_month_cell_at_position (self, x, y, &clicked_cell);
- pango_font_description_free (font_desc);
- g_free (header_str);
- gtk_style_context_restore (context);
-
- /*same padding for the rest of the view */
- gtk_style_context_get_padding (context, state, &padding);
-
- /* grid header */
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "header");
-
- gtk_style_context_get (context, state, "font", &font_desc, NULL);
- pango_layout_set_font_description (layout, font_desc);
- for (i = 0; i < 7; i++)
- {
- gchar *upcased_day;
-
- j = 6 * self->k + sw * i;
- upcased_day = g_utf8_strup (gcal_get_weekday ((j + self->first_weekday) % 7), -1);
- pango_layout_set_text (layout, upcased_day, -1);
- pango_layout_get_pixel_size (layout, &font_width, &font_height);
-
- gtk_render_layout (context, cr,
- cell_width * (i + self->k) + (sw * padding.left) - self->k * font_width,
- start_grid_y - padding.bottom - font_height,
- layout);
- g_free (upcased_day);
- }
-
- pango_font_description_free (font_desc);
- gtk_style_context_restore (context);
-
- /* Drag and Drop highlight */
- if (self->dnd_cell != -1)
- {
- gtk_render_background (context,
- cr,
- floor (cell_width * real_cell (self->dnd_cell % 7, self->k)),
- floor (cell_height * (self->dnd_cell / 7 + first_row_gap) + start_grid_y),
- cell_width + 1,
- cell_height + 1);
- }
-
- /* grey background on cells outside the current month */
- unused_start = is_ltr ? 0 : real_cell (self->days_delay - 1, self->k);
- unused_start_width = self->days_delay;
-
- unused_end = is_ltr ? real_cell (days, self->k) % 7 : 0;
- unused_end_width = 7 * shown_rows - days;
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "offset");
-
- if (self->dnd_cell != -1)
- gtk_drag_unhighlight (widget);
-
- /* Half-cell at the top and bottom */
- if (shown_rows == 5)
- {
- gdouble half_cell = cell_height / 2.0;
-
- gtk_render_background (context,
- cr,
- 0,
- start_grid_y,
- alloc.width,
- half_cell);
-
- gtk_render_background (context,
- cr,
- 0,
- start_grid_y + cell_height * (shown_rows + first_row_gap),
- alloc.width,
- cell_height / 2);
- }
-
- /* Unused cells at the start */
- if (unused_start_width > 0)
- {
- gtk_render_background (context,
- cr,
- floor (cell_width * unused_start),
- floor (cell_height * first_row_gap + start_grid_y),
- cell_width * unused_start_width,
- cell_height + 1);
- }
-
- /* Unused cells at the end */
- if (unused_end_width > 0)
- {
- gtk_render_background (context,
- cr,
- floor (cell_width * unused_end),
- floor (start_grid_y + cell_height * (first_row_gap + shown_rows - 1)),
- cell_width * unused_end_width + 1,
- cell_height + 1);
- }
-
- if (self->dnd_cell != -1)
- gtk_drag_highlight (widget);
-
- gtk_style_context_restore (context);
-
- /* grid numbers */
- gtk_style_context_get (context, state, "font", &font_desc, NULL);
- pango_layout_set_font_description (layout, font_desc);
- for (i = 0; i < 7 * shown_rows; i++)
- {
- gchar *nr_day;
- gint column = i % 7;
- gint row = i / 7;
- gint real_i = real_cell (i, self->k);
-
- j = 7 * ((i + 7 * self->k) / 7) + sw * (i % 7) + (1 - self->k);
- if (j <= self->days_delay)
- continue;
- else if (j > days)
- continue;
- j -= self->days_delay;
-
- nr_day = g_strdup_printf ("%d", j);
-
- if (self->date->year == g_date_time_get_year (today) &&
- self->date->month == g_date_time_get_month (today) &&
- j == g_date_time_get_day_of_month (today))
- {
- PangoFontDescription *cfont_desc;
- PangoLayout *clayout;
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "current");
-
- /*
- * If the current day is not under a DnD, it's actually not possible
- * to *not* show the DnD indicator using only CSS. So we have to fake
- * the "I'm not under DnD" state.
- */
- if (j != self->dnd_cell)
- gtk_style_context_set_state (context, state & ~GTK_STATE_FLAG_DROP_ACTIVE);
-
- clayout = gtk_widget_create_pango_layout (widget, nr_day);
- gtk_style_context_get (context, state, "font", &cfont_desc, NULL);
- pango_layout_set_font_description (clayout, cfont_desc);
- pango_layout_get_pixel_size (clayout, &font_width, &font_height);
-
- /* FIXME: hardcoded padding of the number background */
- gtk_render_background (context, cr,
- cell_width * column,
- cell_height * (row + first_row_gap) + start_grid_y,
- cell_width, cell_height);
- gtk_render_layout (context, cr,
- cell_width * (column + 1 - self->k) - sw * padding.right + (self->k - 1) *
font_width,
- cell_height * (row + 1 + first_row_gap) - font_height - padding.bottom +
start_grid_y,
- clayout);
-
- gtk_style_context_restore (context);
- pango_font_description_free (cfont_desc);
- g_object_unref (clayout);
- }
- else if (lower_mark <= j && j <= upper_mark)
- {
- gtk_style_context_save (context);
- gtk_style_context_set_state (context, GTK_STATE_FLAG_SELECTED);
-
- pango_layout_set_text (layout, nr_day, -1);
- pango_layout_set_font_description (layout, sfont_desc);
- pango_layout_get_pixel_size (layout, &font_width, &font_height);
-
- gtk_render_layout (context, cr,
- cell_width * (column + 1 - self->k) - sw * padding.right + (self->k - 1) *
font_width,
- cell_height * (row + 1 + first_row_gap) - font_height - padding.bottom +
start_grid_y,
- layout);
-
- gtk_style_context_restore (context);
- pango_layout_set_font_description (layout, font_desc);
- }
- else
- {
- pango_layout_set_text (layout, nr_day, -1);
- pango_layout_get_pixel_size (layout, &font_width, &font_height);
-
- gtk_render_layout (context, cr,
- cell_width * (column + 1 - self->k) - sw * padding.right + (self->k - 1) *
font_width,
- cell_height * (row + 1 + first_row_gap) - font_height - padding.bottom +
start_grid_y,
- layout);
- }
-
- g_free (nr_day);
-
- if (g_hash_table_contains (self->overflow_cells, GINT_TO_POINTER (real_i)))
- {
- GList *l;
- PangoLayout *overflow_layout;
- PangoFontDescription *ofont_desc;
- gchar *overflow_str;
- gdouble y_value;
-
- l = g_hash_table_lookup (self->overflow_cells, GINT_TO_POINTER (real_i));
-
- /* TODO: Warning: in some languages this string can be too long and may overlap with the number */
- overflow_str = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "Other event", "Other %d events",
g_list_length (l)),
- g_list_length (l));
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "overflow");
- if (self->hovered_overflow_indicator == real_i)
- {
- gtk_style_context_set_state (context, GTK_STATE_FLAG_PRELIGHT);
- gtk_style_context_get (context, GTK_STATE_FLAG_PRELIGHT, "font", &ofont_desc, NULL);
- }
- else
- {
- gtk_style_context_get (context, state, "font", &ofont_desc, NULL);
- }
-
- if (self->k)
- column = MIRROR (column, 0, 7) - 1;
-
- overflow_layout = gtk_widget_create_pango_layout (widget, overflow_str);
-
- pango_layout_set_font_description (overflow_layout, ofont_desc);
- pango_layout_set_width (overflow_layout, pango_units_from_double (cell_width - (font_width +
padding.right + padding.left)));
- pango_layout_set_alignment (overflow_layout, PANGO_ALIGN_CENTER);
- pango_layout_set_ellipsize (overflow_layout, PANGO_ELLIPSIZE_END);
- pango_layout_get_pixel_size (overflow_layout, &font_width, &font_height);
- y_value = cell_height * (row + 1 + first_row_gap) - font_height - padding.bottom + start_grid_y;
-
- if ((!gtk_widget_is_visible (self->overflow_popover) && self->hovered_overflow_indicator ==
real_i) ||
- gtk_widget_is_visible (self->overflow_popover))
- {
- gtk_render_background (context, cr, cell_width * column, y_value - padding.bottom,
- cell_width, font_height + padding.bottom * 2);
- }
-
- gtk_render_layout (context, cr, cell_width * column + padding.left, y_value, overflow_layout);
-
- gtk_style_context_remove_class (context, "overflow");
- gtk_style_context_restore (context);
- g_free (overflow_str);
- pango_font_description_free (ofont_desc);
- g_object_unref (overflow_layout);
- }
- }
- pango_font_description_free (sfont_desc);
- pango_font_description_free (font_desc);
-
- /* lines */
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, "lines");
-
- gtk_style_context_get_color (context, state, &color);
- cairo_set_line_width (cr, LINE_WIDTH);
- gdk_cairo_set_source_rgba (cr, &color);
- /* vertical lines, the easy ones */
- for (i = 0; i < 6; i++)
- {
- pos_x = cell_width * (i + 1);
- cairo_move_to (cr, pos_x + (LINE_WIDTH / 2), start_grid_y);
- cairo_rel_line_to (cr, 0, alloc.height - start_grid_y);
- }
-
- /* top horizontal line */
- cairo_move_to (cr, 0, start_grid_y + (LINE_WIDTH / 2));
- cairo_rel_line_to (cr, alloc.width, 0);
-
- /* drawing weeks lines */
- for (i = 0; i < (shown_rows % 2) + 5; i++)
- {
- pos_y = cell_height * (i + 0.5 * (2.0 - (shown_rows % 2))) + start_grid_y;
- cairo_move_to (cr, 0, pos_y + (LINE_WIDTH / 2));
- cairo_rel_line_to (cr, alloc.width, 0);
- }
- cairo_stroke (cr);
- gtk_style_context_restore (context);
-
- /* selection borders */
- if (self->start_mark_cell && self->end_mark_cell)
- {
- gint first_mark, last_mark;
- gint pos_x2, pos_y2;
- gint start_year, end_year, start_month, end_month;
-
- start_year = g_date_time_get_year (self->start_mark_cell);
- end_year = g_date_time_get_year (self->end_mark_cell);
- start_month = g_date_time_get_month (self->start_mark_cell);
- end_month = g_date_time_get_month (self->end_mark_cell);
-
- last_mark = real_cell (g_date_time_get_day_of_month (self->end_mark_cell) + self->days_delay - 1,
self->k);
-
- if (start_year == end_year && start_month == end_month)
- {
- first_mark = real_cell (g_date_time_get_day_of_month (self->start_mark_cell) + self->days_delay - 1,
self->k);
- }
- else
- {
- gint start_cell, end_cell;
-
- start_cell = self->days_delay;
- end_cell = icaltime_days_in_month (end_month, end_year) + self->days_delay - 1;
-
- if (start_year != end_year)
- first_mark = start_year < end_year ? real_cell (start_cell, self->k) : real_cell(end_cell,
self->k);
- else
- first_mark = start_month < end_month ? real_cell (start_cell, self->k) : real_cell (end_cell,
self->k);
- }
-
- if (first_mark > last_mark)
- {
- gint tmp = first_mark;
- first_mark = last_mark;
- last_mark = tmp;
- }
-
- /* Retrieve the selection color */
- gtk_style_context_save (context);
- gtk_style_context_set_state (context, state | GTK_STATE_FLAG_SELECTED);
- gtk_style_context_get_color (context, state | GTK_STATE_FLAG_SELECTED, &color);
- gtk_style_context_restore (context);
-
- gdk_cairo_set_source_rgba (cr, &color);
- cairo_set_line_width (cr, LINE_WIDTH);
-
- if ((first_mark / 7) == (last_mark / 7))
- {
- /* selection in 1 row with 1 rectangular outline */
- gint row = first_mark / 7;
- gint first_column = first_mark % 7;
- gint last_column = last_mark % 7;
-
- pos_x = cell_width * (first_column);
- pos_x2 = cell_width * (last_column + 1);
- pos_y = cell_height * (row + first_row_gap) + start_grid_y;
- pos_y2 = cell_height * (row + 1.0 + first_row_gap) + start_grid_y;
- cairo_rectangle (cr, pos_x + (LINE_WIDTH / 2), pos_y + (LINE_WIDTH / 2),
- pos_x2 - pos_x + (LINE_WIDTH / 2), pos_y2 - pos_y + (LINE_WIDTH / 2));
- }
- else if ((first_mark / 7) == ((last_mark / 7) - 1) && (first_mark % 7) > ((last_mark % 7) + 1))
- {
- /* selection in 2 rows with 2 seperate rectangular outlines */
- gint first_row = first_mark / 7;
- gint last_row = last_mark / 7;
- gint first_column = first_mark % 7;
- gint last_column = last_mark % 7;
- gdouble end;
-
- for (i = first_row; i <= last_row; i++)
- {
- if (i == first_row)
- {
- pos_x = cell_width * (first_column + self->k);
- end = (alloc.width * (1 - self->k)) - pos_x;
- }
- else if (i == last_row)
- {
- pos_x = cell_width * (last_column + 1 - self->k);
- end = (alloc.width * self->k) - pos_x;
- }
- else
- {
- pos_x = 0;
- end = alloc.width;
- }
-
- pos_y = cell_height * (i + first_row_gap) + start_grid_y;
- pos_y2 = cell_height * (i + 1.0 + first_row_gap) + start_grid_y;
- cairo_rectangle (cr, pos_x + (LINE_WIDTH / 2), pos_y + (LINE_WIDTH / 2),
- (gint)end + (LINE_WIDTH / 2), pos_y2 - pos_y + (LINE_WIDTH / 2));
- }
- }
- else
- {
- /* multi-row selection with a single outline */
- gint first_row = first_mark / 7;
- gint last_row = last_mark / 7;
- gint first_column = first_mark % 7;
- gint last_column = last_mark % 7;
- gdouble start_x = (cell_width * first_column) + (LINE_WIDTH / 2);
- gdouble start_y = (cell_height * (first_row + first_row_gap)) + start_grid_y + (LINE_WIDTH / 2);
- gdouble end_x = (cell_width * (last_column + 1.0)) + (LINE_WIDTH / 2);
- gdouble end_y = (cell_height * (last_row + first_row_gap + 1.0)) + start_grid_y + (LINE_WIDTH / 2);
- gdouble max_x = alloc.width - (LINE_WIDTH / 2);
-
- /* Draw the irregular shaped selection box starting from the
- * top-left corner of the start date (start_{x,y}) clock-wise
- * to the right-bottom corner of the end date (end_{x,y}) and
- * on finishing at the start date again.
- */
- cairo_move_to (cr, start_x, start_y);
- cairo_line_to (cr, max_x, start_y);
-
- /* Skip intermediate drawing steps if end_{x,y} are at the
- * last column in the row, this makes sure we always draw the
- * outline within the visible drawing area.
- */
- if (last_column == 6)
- {
- cairo_line_to (cr, max_x, end_y);
- }
- else
- {
- cairo_line_to (cr, max_x, end_y - cell_height);
- cairo_line_to (cr, end_x, end_y - cell_height);
- cairo_line_to (cr, end_x, end_y);
- }
-
- cairo_line_to (cr, (LINE_WIDTH / 2), end_y);
- cairo_line_to (cr, (LINE_WIDTH / 2), start_y + cell_height);
- cairo_line_to (cr, start_x, start_y + cell_height);
- cairo_line_to (cr, start_x, start_y);
- }
-
- cairo_stroke_preserve (cr);
- /* selection background fill */
- cairo_set_source_rgba(cr, color.red, color.green, color.blue, 0.1);
- cairo_fill(cr);
- }
-
- /* Draw focus rectangle */
- if (self->keyboard_cell > self->days_delay - 1)
- {
- gint localized_cell;
- gint x;
- gint y;
-
- localized_cell = real_cell (self->keyboard_cell % 7, self->k);
-
- x = cell_width * (localized_cell);
- y = cell_height * (self->keyboard_cell / 7 + first_row_gap) + start_grid_y;
-
- gtk_render_focus (context, cr, x, y, cell_width, cell_height);
- }
-
- g_object_unref (layout);
-
- if (GTK_WIDGET_CLASS (gcal_month_view_parent_class)->draw != NULL)
- GTK_WIDGET_CLASS (gcal_month_view_parent_class)->draw (widget, cr);
-
- return FALSE;
-}
-
-static gboolean
-gcal_month_view_button_press (GtkWidget *widget,
- GdkEventButton *event)
-{
- GcalMonthView *self;
-
- gint days, clicked_cell;
- gboolean pressed_indicator = FALSE;
-
- self = GCAL_MONTH_VIEW (widget);
- days = self->days_delay + icaltime_days_in_month (self->date->month, self->date->year);
- clicked_cell = gather_button_event_data (GCAL_MONTH_VIEW (widget), event->x, event->y, &pressed_indicator,
NULL, NULL);
clicked_cell = real_cell (clicked_cell, self->k);
if (clicked_cell >= self->days_delay && clicked_cell < days)
@@ -2435,103 +1813,60 @@ gcal_month_view_button_press (GtkWidget *widget,
self->start_mark_cell = g_date_time_new_local (self->date->year, self->date->month,
self->keyboard_cell - self->days_delay + 1,
0, 0, 0);
- gtk_widget_queue_draw (widget);
- }
- if (pressed_indicator && g_hash_table_contains (self->overflow_cells, GINT_TO_POINTER (clicked_cell)))
- self->pressed_overflow_indicator = clicked_cell;
+ update_month_cells (self);
+ }
- return GDK_EVENT_PROPAGATE;
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
}
-/**
- * gcal_month_view_motion_notify_event:
- * @widget:
- * @event:
- *
- * Update self->end_cell_mark in order to update the drawing
- * belonging to the days involved in the event creation
- *
- * Returns:
- **/
static gboolean
gcal_month_view_motion_notify_event (GtkWidget *widget,
GdkEventMotion *event)
{
GcalMonthView *self;
-
+ gdouble x, y;
gint days;
- gint new_end_cell, new_hovered_cell;
- gboolean hovered_indicator = FALSE;
+ gint new_end_cell;
- self = GCAL_MONTH_VIEW (widget);
+ GCAL_ENTRY;
+ self = GCAL_MONTH_VIEW (widget);
days = self->days_delay + icaltime_days_in_month (self->date->month, self->date->year);
- new_end_cell = gather_button_event_data (GCAL_MONTH_VIEW (widget), event->x, event->y, &hovered_indicator,
NULL, NULL);
+ if (!gcal_translate_child_window_position (widget, event->window, event->x, event->y, &x, &y))
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
+
+ get_month_cell_at_position (self, x, y, &new_end_cell);
if (self->start_mark_cell)
{
if (!(event->state & GDK_BUTTON_PRESS_MASK))
- return TRUE;
-
- if (new_end_cell >= self->days_delay && new_end_cell < days)
- {
- gint previous_end_cell;
+ GCAL_RETURN (GDK_EVENT_STOP);
- previous_end_cell = new_end_cell;
+ if (new_end_cell < self->days_delay || new_end_cell >= days)
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
- /* Let the keyboard focus track the pointer */
- self->keyboard_cell = new_end_cell;
+ /* Let the keyboard focus track the pointer */
+ self->keyboard_cell = new_end_cell;
- /*
- * When there is a previously set end mark, it should be
- * cleared before assigning a new one.
- */
- if (self->end_mark_cell)
- {
- previous_end_cell = g_date_time_get_day_of_month (self->end_mark_cell) - 1;
-
- g_clear_pointer (&self->end_mark_cell, g_date_time_unref);
- }
-
- if (self->start_mark_cell &&
- self->end_mark_cell &&
- !g_date_time_equal (self->start_mark_cell, self->end_mark_cell))
- {
- self->hovered_overflow_indicator = -1;
- }
-
- if (previous_end_cell != new_end_cell)
- gtk_widget_queue_draw (widget);
+ g_clear_pointer (&self->end_mark_cell, g_date_time_unref);
+ self->end_mark_cell = g_date_time_new_local (self->date->year,
+ self->date->month,
+ new_end_cell - self->days_delay + 1,
+ 0, 0, 0);
- self->end_mark_cell = g_date_time_new_local (self->date->year,
- self->date->month,
- new_end_cell - self->days_delay + 1,
- 0, 0, 0);
+ update_month_cells (self);
- return TRUE;
- }
+ GCAL_RETURN (GDK_EVENT_STOP);
}
else
{
if (gtk_widget_is_visible (self->overflow_popover))
- return FALSE;
-
- if (hovered_indicator)
- new_hovered_cell = new_end_cell;
- else
- new_hovered_cell = -1;
-
- if (self->hovered_overflow_indicator != new_hovered_cell)
- {
- self->hovered_overflow_indicator = new_hovered_cell;
- gtk_widget_queue_draw (widget);
- return TRUE;
- }
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
}
- return FALSE;
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
}
static gboolean
@@ -2541,13 +1876,16 @@ gcal_month_view_button_release (GtkWidget *widget,
GcalMonthView *self;
gdouble x, y;
gint days, current_day;
- gboolean released_indicator = FALSE;
+
+ GCAL_ENTRY;
self = GCAL_MONTH_VIEW (widget);
days = self->days_delay + icaltime_days_in_month (self->date->month, self->date->year);
- current_day = gather_button_event_data (GCAL_MONTH_VIEW (widget), event->x, event->y, &released_indicator,
&x, &y);
- current_day = real_cell (current_day, self->k);
+ if (!gcal_translate_child_window_position (widget, event->window, event->x, event->y, &x, &y))
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
+
+ get_month_cell_at_position (self, x, y, ¤t_day);
if (current_day >= self->days_delay && current_day < days)
{
@@ -2561,12 +1899,14 @@ gcal_month_view_button_release (GtkWidget *widget,
self->date->day = g_date_time_get_day_of_month (self->end_mark_cell);
/* First, make sure to show the popover */
- valid = show_popover_for_position (GCAL_MONTH_VIEW (widget), x, y, released_indicator);
+ valid = emit_create_event (self);
+
+ update_month_cells (self);
/* Then update the active date */
g_object_notify (G_OBJECT (self), "active-date");
- return valid;
+ GCAL_RETURN (valid);
}
else
{
@@ -2575,7 +1915,7 @@ gcal_month_view_button_release (GtkWidget *widget,
gtk_widget_queue_draw (widget);
- return FALSE;
+ GCAL_RETURN (GDK_EVENT_PROPAGATE);
}
}
@@ -2609,15 +1949,11 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
widget_class->map = gcal_month_view_map;
widget_class->unmap = gcal_month_view_unmap;
widget_class->size_allocate = gcal_month_view_size_allocate;
- widget_class->draw = gcal_month_view_draw;
widget_class->button_press_event = gcal_month_view_button_press;
widget_class->motion_notify_event = gcal_month_view_motion_notify_event;
widget_class->button_release_event = gcal_month_view_button_release;
widget_class->direction_changed = gcal_month_view_direction_changed;
widget_class->key_press_event = gcal_month_view_key_press;
- widget_class->drag_motion = gcal_month_view_drag_motion;
- widget_class->drag_drop = gcal_month_view_drag_drop;
- widget_class->drag_leave = gcal_month_view_drag_leave;
widget_class->scroll_event = gcal_month_view_scroll_event;
container_class = GTK_CONTAINER_CLASS (klass);
@@ -2636,23 +1972,35 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
1,
GCAL_TYPE_EVENT_WIDGET);
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/month-view.ui");
+
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, events_box);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_0);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_1);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_2);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_3);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_4);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_5);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, label_6);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, month_label);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, overflow_popover);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, popover_title);
+ gtk_widget_class_bind_template_child (widget_class, GcalMonthView, year_label);
+
+ gtk_widget_class_bind_template_callback (widget_class, add_new_event_button_cb);
+ gtk_widget_class_bind_template_callback (widget_class, cancel_dnd_from_overflow_popover);
+
gtk_widget_class_set_css_name (widget_class, "calendar-view");
}
static void
gcal_month_view_init (GcalMonthView *self)
{
- GtkWidget *grid;
- GtkWidget *button;
+ gtk_widget_init_template (GTK_WIDGET (self));
gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
-
- cancel_selection (self);
-
self->dnd_cell = -1;
- self->pressed_overflow_indicator = -1;
- self->hovered_overflow_indicator = -1;
self->children = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_list_free);
self->single_cell_children = 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);
@@ -2660,38 +2008,6 @@ gcal_month_view_init (GcalMonthView *self)
self->k = gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL;
- self->overflow_popover = gtk_popover_new (GTK_WIDGET (self));
- gtk_style_context_add_class (gtk_widget_get_style_context (self->overflow_popover), "events");
- g_signal_connect_swapped (self->overflow_popover, "hide", G_CALLBACK (overflow_popover_hide), self);
- g_signal_connect_swapped (self->overflow_popover,
- "drag-motion",
- G_CALLBACK (cancel_dnd_from_overflow_popover),
- self->overflow_popover);
-
- grid = gtk_grid_new ();
- g_object_set (grid, "row-spacing", 6, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
- gtk_container_add (GTK_CONTAINER (self->overflow_popover), grid);
-
- self->popover_title = gtk_label_new (NULL);
- gtk_style_context_add_class (gtk_widget_get_style_context (self->popover_title), "sidebar-header");
- g_object_set (self->popover_title, "margin", 6, "halign", GTK_ALIGN_START, NULL);
- self->events_list_box = gtk_list_box_new ();
- gtk_list_box_set_selection_mode (GTK_LIST_BOX (self->events_list_box), GTK_SELECTION_NONE);
- button = gtk_button_new_with_label (_("Add Event…"));
- g_object_set (button, "hexpand", TRUE, NULL);
- g_signal_connect (button, "clicked", G_CALLBACK (add_new_event_button_cb), self);
-
- gtk_container_add (GTK_CONTAINER (grid), self->popover_title);
- gtk_container_add (GTK_CONTAINER (grid), self->events_list_box);
- gtk_container_add (GTK_CONTAINER (grid), button);
-
- /* Setup the month view as a drag n' drop destination */
- gtk_drag_dest_set (GTK_WIDGET (self),
- 0,
- NULL,
- 0,
- GDK_ACTION_MOVE);
-
/*
* Also set the overflow popover as a drop destination, so we can hide
* it when the user starts dragging an event that is inside the overflow
@@ -2702,6 +2018,17 @@ gcal_month_view_init (GcalMonthView *self)
NULL,
0,
GDK_ACTION_MOVE);
+
+ /* Weekday header labels */
+ self->weekday_label[0] = self->label_0;
+ self->weekday_label[1] = self->label_1;
+ self->weekday_label[2] = self->label_2;
+ self->weekday_label[3] = self->label_3;
+ self->weekday_label[4] = self->label_4;
+ self->weekday_label[5] = self->label_5;
+ self->weekday_label[6] = self->label_6;
+
+ update_weekday_labels (self);
}
/* Public API */
@@ -2713,7 +2040,7 @@ gcal_month_view_init (GcalMonthView *self)
*
* Set the first day of the week according to the locale, being
* 0 for Sunday, 1 for Monday and so on.
- **/
+ */
void
gcal_month_view_set_first_weekday (GcalMonthView *self,
gint day_nr)
@@ -2725,6 +2052,8 @@ gcal_month_view_set_first_weekday (GcalMonthView *self,
/* update days_delay */
if (self->date)
self->days_delay = (time_day_of_week (1, self->date->month - 1, self->date->year) - self->first_weekday
+ 7) % 7;
+
+ update_weekday_labels (self);
}
/**
@@ -2733,7 +2062,7 @@ gcal_month_view_set_first_weekday (GcalMonthView *self,
* @use_24h:
*
* Whether the view will show time using 24h or 12h format
- **/
+ */
void
gcal_month_view_set_use_24h_format (GcalMonthView *self,
gboolean use_24h)
diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c
index 7776ee7..ca0125f 100644
--- a/src/views/gcal-year-view.c
+++ b/src/views/gcal-year-view.c
@@ -1065,7 +1065,7 @@ draw_navigator (GcalYearView *year_view,
/* read header from CSS code related to the view */
gtk_style_context_save (context);
- gtk_style_context_add_class (context, "start-header");
+ gtk_style_context_add_class (context, "primary-label");
header_str = g_strdup_printf ("%d", year_view->date->year);
gtk_style_context_get (context, state_flags, "font", &font_desc, NULL);
@@ -1348,7 +1348,7 @@ calculate_sizes (GcalYearView *self)
/* get header info from CSS */
context = gtk_widget_get_style_context (GTK_WIDGET (self));
gtk_style_context_save (context);
- gtk_style_context_add_class (context, "start-header");
+ gtk_style_context_add_class (context, "primary-label");
gtk_style_context_get (context, gtk_style_context_get_state (context),
"padding-top", &padding_top,
"padding-bottom", &padding_bottom,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
