github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

This reduces the native code in favor of another library so there is less to maintain.

Browse source
This commit is contained in:
Robin Krom 2021-01-10 10:33:53 +01:00
commit 24c9b8fb36
20 changed files with 42 additions and 1108 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Greenshot/Helpers/CaptureHelper.cs
View file

@ -516,10 +516,10 @@ namespace Greenshot.Helpers {
/// </summary>
/// <param name="e">SurfaceMessageEventArgs</param>
private void OpenCaptureOnClick(SurfaceMessageEventArgs e) {
var notifyIcon = SimpleServiceProvider.Current.GetInstance<NotifyIcon>();
if (!(notifyIcon.Tag is SurfaceMessageEventArgs eventArgs)) {
var notifyIcon = SimpleServiceProvider.Current.GetInstance<NotifyIcon>();
if (notifyIcon.Tag is not SurfaceMessageEventArgs eventArgs) {
Log.Warn("OpenCaptureOnClick called without SurfaceMessageEventArgs");
return;
return;
}
ISurface surface = eventArgs.Surface;
if (surface != null)
@ -549,18 +549,18 @@ namespace Greenshot.Helpers {
var notifyIconClassicMessageHandler = SimpleServiceProvider.Current.GetInstance<INotificationService>();
switch (eventArgs.MessageType) {
case SurfaceMessageTyp.Error:
notifyIconClassicMessageHandler.ShowErrorMessage(eventArgs.Message, 10000);
notifyIconClassicMessageHandler.ShowErrorMessage(eventArgs.Message, TimeSpan.FromHours(1));
break;
case SurfaceMessageTyp.Info:
notifyIconClassicMessageHandler.ShowInfoMessage(eventArgs.Message, 10000, () =>
{
notifyIconClassicMessageHandler.ShowInfoMessage(eventArgs.Message, TimeSpan.FromHours(1), () =>
{
Log.Info("Clicked!");
});
break;
case SurfaceMessageTyp.FileSaved:
case SurfaceMessageTyp.UploadedUri:
// Show a balloon and register an event handler to open the "capture" for if someone clicks the balloon.
notifyIconClassicMessageHandler.ShowInfoMessage(eventArgs.Message, 10000, () => OpenCaptureOnClick(eventArgs));
notifyIconClassicMessageHandler.ShowInfoMessage(eventArgs.Message, TimeSpan.FromHours(1), () => OpenCaptureOnClick(eventArgs));
break;
}
}