[BUG] Folders to not extend over screen edge (#324), version 1.2.8.11

This commit is contained in:
Markus Hofknecht 2022-02-22 16:52:02 +01:00
parent f4b540f339
commit 9234515fd9
4 changed files with 33 additions and 5 deletions

View file

@ -59,7 +59,7 @@ namespace SystemTrayMenu
"A problem has been encountered and the application needs to restart. " +
"Reporting this error will help us make our product better. " +
"Press 'Yes' to open your standard email app (emailto: Markus@Hofknecht.eu). " + Environment.NewLine +
@"You can also create a issue manually here https://github.com/Hofknecht/SystemTrayMenu/issues" + Environment.NewLine +
@"You can also create an issue manually here https://github.com/Hofknecht/SystemTrayMenu/issues" + Environment.NewLine +
"Press 'Cancel' to quit SystemTrayMenu.",
"SystemTrayMenu Crashed",
MessageBoxButtons.YesNoCancel);

View file

@ -250,7 +250,7 @@ Thanks for ideas, reporting issues and contributing!
#285 #286 [dao-net](https://github.com/dao-net),
#288 William P.,
#294 #295 #296 Stefan Mahrer,
#225 #297 #299 #317 #321 [chip33](https://github.com/chip33),
#225 #297 #299 #317 #321 #324 #330 [chip33](https://github.com/chip33),
#298 [phanirithvij](https://github.com/phanirithvij),
#306 [wini2](https://github.com/wini2),

View file

@ -114,7 +114,7 @@ namespace SystemTrayMenu.Helper
aboutBox.AppMoreInfo += "#235 #242 243 #247, #271 Tom, #237 Torsten S., #240 video Patrick, #244 Gunter D., #246 #329 MACE4GITHUB, #259 #310 vanjac, ";
aboutBox.AppMoreInfo += "#262 terencemcdonnell, #269 petersnows25, #272 Peter M., #273 #274 ParasiteDelta, #275 #276 #278 donaldaken, ";
aboutBox.AppMoreInfo += "#277 Jan S., #282 akuznets, #283 #284 #289 RuSieg, #285 #286 dao-net, #288 William P., #294 #295 #296 Stefan Mahrer, ";
aboutBox.AppMoreInfo += "#225 #297 #299 #317 #321 chip33, #298 phanirithvij, #306 wini2" + Environment.NewLine;
aboutBox.AppMoreInfo += "#225 #297 #299 #317 #321 #324 #330 chip33, #298 phanirithvij, #306 wini2" + Environment.NewLine;
aboutBox.AppMoreInfo += @"
Sponsors - Thank you!
------------------

View file

@ -460,7 +460,21 @@ namespace SystemTrayMenu.UserInterface
bounds.X + bounds.Width <= x + Width - scaling)
{
x = menuPredecessor.Location.X - Width + scaling;
directionToRight = !directionToRight;
if (x < bounds.X &&
menuPredecessor.Location.X + menuPredecessor.Width < bounds.X + bounds.Width &&
bounds.X + (bounds.Width / 2) > menuPredecessor.Location.X + (Width / 2))
{
x = bounds.X + bounds.Width - Width + scaling;
}
else
{
if (x < bounds.X)
{
x = bounds.X;
}
directionToRight = !directionToRight;
}
}
}
else
@ -471,7 +485,21 @@ namespace SystemTrayMenu.UserInterface
x < bounds.X)
{
x = menuPredecessor.Location.X + menuPredecessor.Width - scaling;
directionToRight = !directionToRight;
if (x + Width > bounds.X + bounds.Width &&
menuPredecessor.Location.X > bounds.X &&
bounds.X + (bounds.Width / 2) < menuPredecessor.Location.X + (Width / 2))
{
x = bounds.X;
}
else
{
if (x + Width > bounds.X + bounds.Width)
{
x = bounds.X + bounds.Width - Width + scaling;
}
directionToRight = !directionToRight;
}
}
}