CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-27 18:40:32 +12:00
Code Issues Projects Releases Wiki Activity

#110, #111, version 0.11.1.1

Browse source 
[BUG] ArgumentOutOfRangeException #110
[BUG] AutosizeRows when high dpi #111
This commit is contained in:
Markus Hofknecht 2020-06-22 21:52:35 +02:00
parent fe02510cf6
commit 65159276d7
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Business/WaitToLoadMenu.cs
View file

@ -89,12 +89,15 @@ namespace SystemTrayMenu.Handler
internal void EnterOpensInstantly(DataGridView dgv, int rowIndex) internal void EnterOpensInstantly(DataGridView dgv, int rowIndex)
{ {
timerStartLoad.Stop(); if (dgv.Rows.Count > rowIndex)
StopLoadMenu.Invoke(); {
SetData(dgv, rowIndex); timerStartLoad.Stop();
MouseActive = false; StopLoadMenu.Invoke();
checkForMouseActive = false; SetData(dgv, rowIndex);
CallOpenMenuNow(); MouseActive = false;
checkForMouseActive = false;
CallOpenMenuNow();
}
} }
internal void MouseMove(object sender, MouseEventArgs e) internal void MouseMove(object sender, MouseEventArgs e)

15
UserInterface/Menu.cs
View file

@ -37,7 +37,6 @@ namespace SystemTrayMenu.UserInterface
private readonly Fading fading = new Fading(); private readonly Fading fading = new Fading();
private bool isShowing = false; private bool isShowing = false;
private bool dgvAutoResizeRowDone = false;
internal Menu() internal Menu()
{ {
@ -242,10 +241,14 @@ namespace SystemTrayMenu.UserInterface
internal void AdjustSizeAndLocation(Menu menuPredecessor = null, internal void AdjustSizeAndLocation(Menu menuPredecessor = null,
bool directionToRight = false) bool directionToRight = false)
{ {
if (!dgvAutoResizeRowDone) CheckForAutoResizeRowDone();
void CheckForAutoResizeRowDone()
{ {
dgv.AutoResizeRows(); if (!(bool)dgv.Tag)
dgvAutoResizeRowDone = true; {
dgv.AutoResizeRows();
dgv.Tag = true;
}
} }
int dgvHeightNeeded = dgv.Rows.GetRowsHeight( int dgvHeightNeeded = dgv.Rows.GetRowsHeight(
@ -277,14 +280,14 @@ namespace SystemTrayMenu.UserInterface
{ {
if (directionToRight) if (directionToRight)
{ {
x = menuPredecessor.Location.X + x = menuPredecessor.Location.X +
menuPredecessor.Width - menuPredecessor.Width -
(int)Math.Round(Scaling.Factor, 0, (int)Math.Round(Scaling.Factor, 0,
MidpointRounding.AwayFromZero); MidpointRounding.AwayFromZero);
} }
else else
{ {
x = menuPredecessor.Location.X - x = menuPredecessor.Location.X -
Width + Width +
(int)Math.Round(Scaling.Factor, 0, (int)Math.Round(Scaling.Factor, 0,
MidpointRounding.AwayFromZero); MidpointRounding.AwayFromZero);