piezza/Outlook2013CalendarAddIn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug for show past appointments not showing them for all days. Now it will only hide earlier ones (if unchecked) when the selected date == today.

Browse Source
This commit is contained in:
gamosoft_cp 2013-08-08 17:53:30 +00:00
parent 0c2d21ee0a
commit d8fb233a7a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Outlook2013TodoAddIn/AppointmentsControl.cs
View File

@ -70,6 +70,14 @@ namespace Outlook2013TodoAddIn
public AppointmentsControl() public AppointmentsControl()
{ {
InitializeComponent(); InitializeComponent();
if (Properties.Settings.Default.SplitterDistance >= this.splitContainer1.Panel1MinSize && Properties.Settings.Default.SplitterDistance <= this.splitContainer1.Height - this.splitContainer1.Panel2MinSize)
{
// This is to avoid the bug "SplitterDistance must be between Panel1MinSize and Width - Panel2MinSize."
this.splitContainer1.SplitterDistance = Properties.Settings.Default.SplitterDistance;
// TODO: This doesn't work, need to fix (race condition?)
// TODO: Another event is fired after controls are added...
}
} }
/// <summary> /// <summary>
@ -92,13 +100,6 @@ namespace Outlook2013TodoAddIn
if (this.ShowTasks) if (this.ShowTasks)
{ {
this.splitContainer1.Panel2Collapsed = false; this.splitContainer1.Panel2Collapsed = false;
if (Properties.Settings.Default.SplitterDistance >= this.splitContainer1.Panel1MinSize && Properties.Settings.Default.SplitterDistance <= this.splitContainer1.Height - this.splitContainer1.Panel2MinSize)
{
// This is to avoid the bug "SplitterDistance must be between Panel1MinSize and Width - Panel2MinSize."
this.splitContainer1.SplitterDistance = Properties.Settings.Default.SplitterDistance;
// TODO: This doesn't work, need to fix (race condition?)
}
// this.RetrieveTasks();
} }
else else
{ {
@ -199,7 +200,7 @@ namespace Outlook2013TodoAddIn
// Now display the actual appointments below the calendar // Now display the actual appointments below the calendar
DateTime startRange = this.apptCalendar.SelectedDate; DateTime startRange = this.apptCalendar.SelectedDate;
if (!this.ShowPastAppointments) if (!this.ShowPastAppointments && startRange.Date == DateTime.Today)
{ {
startRange = startRange.Add(DateTime.Now.TimeOfDay); startRange = startRange.Add(DateTime.Now.TimeOfDay);
} }