Skip to content

Commit

Permalink
Fix result list horisontal scrollbar was hidden when results are added
Browse files Browse the repository at this point in the history
  • Loading branch information
gerhardol committed Jan 24, 2016
1 parent 3a917f5 commit 64a2cb9
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions UI/Activity/ResultListControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ void SummaryPanel_HandleCreated(object sender, System.EventArgs e)
}
}
}
ChartTablePanel_SizeChanged(null, null);
}

private IList<TrailResultWrapper> m_lastSelectedItems = null;
Expand Down Expand Up @@ -1616,19 +1617,23 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
int c = this.excludeSelectedResults(e.Modifiers == Keys.Shift);
ShowToolTip(this.excludeResultsMenuItem + ": " + c);
}

else if (e.KeyCode == Keys.Space)
{
ShowToolTip(Properties.Resources.UI_Activity_List_Splits + ": " + Data.Settings.SelectSimilarSplits);
this.selectSimilarSplits();
}

else if (e.KeyCode == Keys.Escape)
{
this.m_page.ResultList_Collapse();
}

else if (e.KeyCode == Keys.F11)
{
this.m_page.ResultList_Expand((e.Modifiers & Keys.Shift) == 0 && !m_page.IsPopup);
}

else if (e.KeyCode == Keys.A)
{
if (e.Modifiers == (Keys.Control | Keys.Alt | Keys.Shift))
Expand Down Expand Up @@ -1717,6 +1722,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.m_page.RefreshData(true);
}
}

else if (e.KeyCode == Keys.B)
{
if (e.Modifiers == (Keys.Shift | Keys.Control))
Expand All @@ -1726,6 +1732,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
FixDistanceTrack();
}
}

else if (e.KeyCode == Keys.C)
{
if (e.Modifiers == Keys.Control)
Expand Down Expand Up @@ -1762,6 +1769,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.markCommonStretches();
}
}

else if (e.KeyCode == Keys.D)
{
if (e.Modifiers == Keys.Control)
Expand Down Expand Up @@ -1828,6 +1836,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
Controller.TrailController.Instance.PrimaryCurrentActivityTrail.Trail.DefaultRefActivity);
}
}

else if (e.KeyCode == Keys.E)
{
if (e.Modifiers == (Keys.Shift | Keys.Control))
Expand Down Expand Up @@ -1863,6 +1872,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.m_page.RefreshChart();
}
}

else if (e.KeyCode == Keys.F)
{
//Unofficial shortcuts
Expand Down Expand Up @@ -1894,6 +1904,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.m_page.RefreshChart();
}
}

else if (e.KeyCode == Keys.G)
{
//Unofficial shortcuts
Expand Down Expand Up @@ -1985,6 +1996,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.SelectedResults = m_PersistentSelectionResults;
}
}

else if (e.KeyCode == Keys.H)
{
//Unofficial
Expand All @@ -2002,6 +2014,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
ShowToolTip(Properties.Resources.UI_Activity_List_Splits + ": " + Data.Settings.SelectSimilarSplits + " (" +
Data.Settings.SelectSimilarModulu + ")");
}

else if (e.KeyCode == Keys.I)
{
InsertCategoryTypes c = InsertCategoryTypes.CurrentCategory;
Expand Down Expand Up @@ -2030,6 +2043,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.m_page.RefreshChart();
}
}

else if (e.KeyCode == Keys.L)
{
if ((e.Modifiers & Keys.Control) != 0)
Expand All @@ -2047,6 +2061,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.m_page.RefreshRoute(false);
}
}

else if (e.KeyCode == Keys.N)
{
if (e.Modifiers == Keys.Shift)
Expand All @@ -2061,6 +2076,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
Data.Settings.NonReqIsPause);
this.m_page.RefreshData(true);
}

else if (e.KeyCode == Keys.O)
{
if (e.Modifiers == Keys.Control)
Expand All @@ -2078,6 +2094,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.summaryList.Refresh();
//Only in table, no need to refresh
}

else if (e.KeyCode == Keys.P)
{
//In context menu, not documented, to be removed?
Expand All @@ -2090,6 +2107,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
this.HighScorePopup();
}
}

else if (e.KeyCode == Keys.Q)
{
if (e.Modifiers == (Keys.Shift | Keys.Control))
Expand Down Expand Up @@ -2138,6 +2156,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
}
this.m_page.RefreshData(true);
}

else if (e.KeyCode == Keys.R || e.KeyCode == Keys.F5)
{
//'r' or f5 can beused to recalc when an activity is changed
Expand Down Expand Up @@ -2184,6 +2203,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
ShowToolTip((DateTime.Now - startTime).ToString());
}
}

else if (e.KeyCode == Keys.S)
{
if (e.Modifiers == Keys.Control)
Expand Down Expand Up @@ -2213,6 +2233,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
}
}
}

else if (e.KeyCode == Keys.T)
{
if (e.Modifiers == Keys.Shift)
Expand Down Expand Up @@ -2260,11 +2281,13 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
RefreshSummary();
}
}

else if (e.KeyCode == Keys.U)
{
int res = this.selectWithUR();
ShowToolTip(string.Format(Properties.Resources.UI_Activity_List_URSelect, res));
}

else if (e.KeyCode == Keys.X)
{
if (e.Modifiers == Keys.Alt || e.Modifiers == (Keys.Alt | Keys.Shift))
Expand Down Expand Up @@ -2309,6 +2332,7 @@ void summaryList_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
}
}
}

else if (e.KeyCode == Keys.Z)
{
if (e.Modifiers == Keys.Control)
Expand Down

0 comments on commit 64a2cb9

Please sign in to comment.