Skip to content

Fix issues related to the use of Hdy.Carousel #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fs3o5 wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Fix issues related to the use of Hdy.Carousel #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
283daa0
libhandy fixes
fs3o5 Nov 1, 2020
094ea33
libhandy-fixes
fs3o5 Nov 1, 2020
3e66a4c
libhandy-fixes
fs3o5 Nov 18, 2020
15e08bc
libhandy-fixes
fs3o5 Nov 18, 2020
cc9dfee
libhandy-fixes
fs3o5 Nov 26, 2020
1bc59d8
libhandy-fixes
fs3o5 Nov 26, 2020
be96680
libhandy-fixes
fs3o5 Nov 26, 2020
cf3d9ed
libhandy-fixes
fs3o5 Nov 27, 2020
b426228
libhandy-fixes
fs3o5 Nov 27, 2020
401b0bb
libhandy-fixes
fs3o5 Nov 27, 2020
96e91d2
Merge branch 'master' into libhandy-fixes
meisenzahl Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
return 0;
}

private void update_events_model (E.Source source, Gee.Collection<ECal.Component> events) {
private void update_events_model () {
idle_update_events ();
}

Expand All @@ -185,7 +185,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {

var date = calendar.selected_date;

var model = Widgets.CalendarModel.get_default ();
var model = calendar.current_calmodel;

var events_on_day = new Gee.TreeMap<string, DateTime.EventRow> ();

Expand All @@ -210,16 +210,12 @@ public class DateTime.Indicator : Wingpanel.Indicator {

public override void opened () {
calendar.show_today ();

Widgets.CalendarModel.get_default ().events_added.connect (update_events_model);
Widgets.CalendarModel.get_default ().events_updated.connect (update_events_model);
Widgets.CalendarModel.get_default ().events_removed.connect (update_events_model);
calendar.events_changed.connect (update_events_model);
}

public override void closed () {
Widgets.CalendarModel.get_default ().events_added.disconnect (update_events_model);
Widgets.CalendarModel.get_default ().events_updated.disconnect (update_events_model);
Widgets.CalendarModel.get_default ().events_removed.disconnect (update_events_model);
calendar.events_changed.disconnect (update_events_model);
calendar.clear ();
}
}

Expand Down
35 changes: 4 additions & 31 deletions src/Widgets/calendar/CalendarModel.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace DateTime.Widgets {
public Util.DateRange data_range { get; private set; }

/* The first day of the month */
public GLib.DateTime month_start { get; set; }
public GLib.DateTime month_start { get; private set; }

/* The number of weeks to show in this model */
public int num_weeks { get; private set; default = 6; }
Expand All @@ -46,21 +46,10 @@ namespace DateTime.Widgets {
private HashTable<string, ECal.Client> source_client;
private HashTable<string, ECal.ClientView> source_view;

private static CalendarModel? calendar_model = null;
public CalendarModel (GLib.DateTime date) {
month_start = date;

public static CalendarModel get_default () {
lock (calendar_model) {
if (calendar_model == null) {
calendar_model = new CalendarModel ();
}
}

return calendar_model;
}

construct {
open.begin ();

source_client = new HashTable<string, ECal.Client> (str_hash, str_equal);
source_events = new HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component> > (Util.source_hash_func, Util.source_equal_func);
source_view = new HashTable<string, ECal.ClientView> (str_hash, str_equal);
Expand All @@ -69,10 +58,8 @@ namespace DateTime.Widgets {
if (week_start >= 1 && week_start <= 7) {
week_starts_on = (GLib.DateWeekday) (week_start - 1);
}

month_start = Util.get_start_of_month ();
compute_ranges ();
notify["month-start"].connect (on_parameter_changed);
load_all_sources ();
}

private async void open () {
Expand Down Expand Up @@ -134,14 +121,6 @@ namespace DateTime.Widgets {
source_events.remove (source);
}

public void change_month (int relative) {
month_start = month_start.add_months (relative);
}

public void change_year (int relative) {
month_start = month_start.add_years (relative);
}

/* --- Helper Methods ---// */

private void compute_ranges () {
Expand Down Expand Up @@ -241,12 +220,6 @@ namespace DateTime.Widgets {
debug (@"Event ['$(comp.get_summary())', $(source.dup_display_name()), $(comp.get_uid()))]");
}

/* --- Signal Handlers ---// */
private void on_parameter_changed () {
compute_ranges ();
load_all_sources ();
}

private ECal.ClientView on_client_view_received (AsyncResult results, E.Source source, ECal.Client client) {
ECal.ClientView view;
try {
Expand Down
180 changes: 101 additions & 79 deletions src/Widgets/calendar/CalendarView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,22 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
public signal void event_updates ();
public signal void selection_changed (GLib.DateTime? new_date);

public signal void events_changed ();

public GLib.DateTime? selected_date { get; private set; }

private Hdy.Carousel carousel;
private uint position;
private int rel_postion;
private CalendarModel calmodel;
public CalendarModel current_calmodel {get; private set;}
private GLib.DateTime start_month;
private Gtk.Label label;
private bool showtoday;
private DateTime.Widgets.Grid current_grid;

private DateTime.Widgets.Grid center_grid;
private DateTime.Widgets.Grid left_grid;
private DateTime.Widgets.Grid right_grid;

construct {
label = new Gtk.Label (new GLib.DateTime.now_local ().format (_("%OB, %Y")));
Expand Down Expand Up @@ -61,38 +68,13 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
box_buttons.add (center_button);
box_buttons.add (right_button);

calmodel = CalendarModel.get_default ();
start_month = Util.get_start_of_month ();

var center_grid = create_grid ();
center_grid.set_range (calmodel.data_range, calmodel.month_start);
center_grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);

calmodel.change_month (-1);
var left_grid = create_grid ();
left_grid.set_range (calmodel.data_range, calmodel.month_start);
left_grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);

calmodel.change_month (2);
var right_grid = create_grid ();
right_grid.set_range (calmodel.data_range, calmodel.month_start);
right_grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);
calmodel.change_month (-1);

carousel = new Hdy.Carousel () {
interactive = true,
expand = true,
spacing = 15
};

carousel.add (left_grid);
carousel.add (center_grid);
carousel.add (right_grid);
carousel.scroll_to (center_grid);

position = 1;
rel_postion = 0;
showtoday = false;
show_today ();

carousel.show_all ();

Expand All @@ -103,20 +85,27 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
attach (box_buttons, 1, 0);
attach (carousel, 0, 1, 2);

bool page_changed = false;

left_button.clicked.connect (() => {
carousel.switch_child ((int) carousel.get_position () - 1, carousel.get_animation_duration ());
if (page_changed) {
page_changed = false;
carousel.switch_child ((int) carousel.get_position () - 1, carousel.get_animation_duration ());
}
});

right_button.clicked.connect (() => {
carousel.switch_child ((int) carousel.get_position () + 1, carousel.get_animation_duration ());
if (page_changed) {
page_changed = false;
carousel.switch_child ((int) carousel.get_position () + 1, carousel.get_animation_duration ());
}
});

center_button.clicked.connect (() => {
show_today ();
});

carousel.page_changed.connect ((index) => {
calmodel.change_month (-rel_postion);
if (position > index) {
rel_postion--;
position--;
Expand All @@ -126,54 +115,68 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
} else if (showtoday) {
showtoday = false;
rel_postion = 0;
position = (int) carousel.get_position ();
label.label = calmodel.month_start.format (_("%OB, %Y"));
current_grid.remove_day_focus_in ();
current_grid.events_changed.disconnect (events_changed_sig);
current_grid = center_grid;
current_calmodel = center_grid.calmodel;
label.label = current_calmodel.month_start.format (_("%OB, %Y"));
current_grid.events_changed.connect (events_changed_sig);
selection_changed (selected_date);
current_grid.set_focus_to_today ();
return;
} else {
calmodel.change_month (rel_postion);
return;
}
calmodel.change_month (rel_postion);
current_grid.remove_day_focus_in ();
selected_date = null;
current_grid.events_changed.disconnect (events_changed_sig);
current_grid = (DateTime.Widgets.Grid) carousel.get_children ().nth_data (index);
current_calmodel = current_grid.calmodel;
current_grid.events_changed.connect (events_changed_sig);
selection_changed (selected_date);

/* creates a new Grid, when the Hdy.Carousel is on it's first/last page*/
if (index + 1 == (int) carousel.get_n_pages ()) {
calmodel.change_month (1);
//creates a new Grid, when the Hdy.Carousel is on it's first/last page //
if (index + 1 == (int) carousel.n_pages) {
rel_postion++;
var grid = create_grid ();
grid.set_range (calmodel.data_range, calmodel.month_start);
grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);
carousel.add (grid);
calmodel.change_month (-1);

rel_postion--;
} else if (index == 0) {
calmodel.change_month (-1);
rel_postion--;
var grid = create_grid ();
grid.set_range (calmodel.data_range, calmodel.month_start);
grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);
carousel.prepend (grid);
calmodel.change_month (1);
position++;
rel_postion++;
}
label.label = calmodel.month_start.format (_("%OB, %Y"));
label.label = current_calmodel.month_start.format (_("%OB, %Y"));
page_changed = true;
});
}

private void events_changed_sig () {
events_changed ();
}

private DateTime.Widgets.Grid create_grid () {
var grid = new DateTime.Widgets.Grid ();
var grid = new DateTime.Widgets.Grid (Util.get_start_of_month ().add_months (rel_postion));

grid.show_all ();

grid.on_event_add.connect ((date) => {
grid.on_event_add.connect (on_event_add_callback);

grid.selection_changed.connect (selection_changed_callback);

return grid;
}

private void on_event_add_callback (GLib.DateTime date) {
show_date_in_maya (date);
day_double_click ();
});
}

grid.selection_changed.connect ((date) => {
private void selection_changed_callback (GLib.DateTime date) {
selected_date = date;
selection_changed (date);
});

return grid;
}

public void show_today () {
Expand All @@ -182,38 +185,57 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
var start = Util.get_start_of_month (today);
selected_date = today;
if (start.equal (start_month)) {
if (carousel.n_pages == 0) {
carousel.no_show_all = true;
set_carousel_grids ();
return;
}
position -= rel_postion;
carousel.switch_child (position, carousel.get_animation_duration ());
center_grid.update_today ();
} else {
/*reset Carousel if center_child != the grid of the month of today*/
carousel.no_show_all = true;
foreach (unowned Gtk.Widget grid in carousel.get_children ()) {
carousel.remove (grid);
}
clear ();
set_carousel_grids ();
}
}

private void set_carousel_grids () {
rel_postion = 0;
position = 1;
start_month = Util.get_start_of_month ();

center_grid = create_grid ();
rel_postion = -1;
left_grid = create_grid ();
rel_postion = 1;
right_grid = create_grid ();
rel_postion = 0;

carousel.add (left_grid);
carousel.add (center_grid);
carousel.add (right_grid);

carousel.animation_duration = 0;
carousel.scroll_to (center_grid);
carousel.animation_duration = 250;

current_grid = center_grid;
current_calmodel = center_grid.calmodel;
current_grid.events_changed.connect (events_changed_sig);
label.label = center_grid.calmodel.month_start.format (_("%OB, %Y"));

carousel.show_all ();
}

start_month = Util.get_start_of_month ();
calmodel.month_start = start_month;
var center_grid = create_grid ();
center_grid.set_range (calmodel.data_range, calmodel.month_start);
center_grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);

calmodel.change_month (-1);
var left_grid = create_grid ();
left_grid.set_range (calmodel.data_range, calmodel.month_start);
left_grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);

calmodel.change_month (2);
var right_grid = create_grid ();
right_grid.set_range (calmodel.data_range, calmodel.month_start);
right_grid.update_weeks (calmodel.data_range.first_dt, calmodel.num_weeks);
calmodel.change_month (-1);

carousel.add (left_grid);
carousel.add (center_grid);
carousel.add (right_grid);
carousel.scroll_to (center_grid);
label.label = calmodel.month_start.format (_("%OB, %Y"));
carousel.no_show_all = false;
public void clear () {
foreach (unowned Gtk.Widget grid in carousel.get_children ()) {
carousel.remove (grid);
((DateTime.Widgets.Grid) grid).on_event_add.disconnect (on_event_add_callback);
((DateTime.Widgets.Grid) grid).selection_changed.disconnect (selection_changed_callback);
((DateTime.Widgets.Grid) grid).foreach ((day_grid) => ((DateTime.Widgets.Grid) grid).remove (day_grid));
grid.destroy ();
}
}

Expand Down
Loading