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

Merge branch 'release/1.2.9BF2' of https://github.com/greenshot/greenshot into release/1.2.9BF2

Browse source
This commit is contained in:
Robin 2017-01-18 19:46:11 +01:00
commit e7e1d768b9
2 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Greenshot/Drawing/Fields/FieldAggregator.cs
View file

@ -27,6 +27,7 @@ using Greenshot.Plugin.Drawing;
using GreenshotPlugin.Interfaces.Drawing; using GreenshotPlugin.Interfaces.Drawing;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq;
namespace Greenshot.Drawing.Fields namespace Greenshot.Drawing.Fields
{ {
@ -203,7 +204,7 @@ namespace Greenshot.Drawing.Fields
{ {
return; return;
} }
foreach (var drawableContainer1 in _boundContainers) foreach (var drawableContainer1 in _boundContainers.ToList())
{ {
var drawableContainer = (DrawableContainer) drawableContainer1; var drawableContainer = (DrawableContainer) drawableContainer1;
if (!drawableContainer.HasField(field.FieldType)) if (!drawableContainer.HasField(field.FieldType))

19
GreenshotPlugin/Controls/HotkeyControl.cs
View file

@ -20,7 +20,6 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -49,15 +48,6 @@ namespace GreenshotPlugin.Controls {
private const uint WM_HOTKEY = 0x312; private const uint WM_HOTKEY = 0x312;
private static IntPtr _hotkeyHwnd; private static IntPtr _hotkeyHwnd;
// static HotkeyControl() {
// StringBuilder keyName = new StringBuilder();
// for(uint sc = 0; sc < 500; sc++) {
// if (GetKeyNameText(sc << 16, keyName, 100) != 0) {
// LOG.DebugFormat("SC {0} = {1}", sc, keyName);
// }
// }
// }
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
public enum Modifiers : uint { public enum Modifiers : uint {
NONE = 0, NONE = 0,
@ -96,8 +86,8 @@ namespace GreenshotPlugin.Controls {
// ArrayLists used to enforce the use of proper modifiers. // ArrayLists used to enforce the use of proper modifiers.
// Shift+A isn't a valid hotkey, for instance, as it would screw up when the user is typing. // Shift+A isn't a valid hotkey, for instance, as it would screw up when the user is typing.
private readonly ArrayList _needNonShiftModifier; private readonly IList<int> _needNonShiftModifier = new List<int>();
private readonly ArrayList _needNonAltGrModifier; private readonly IList<int> _needNonAltGrModifier = new List<int>();
private readonly ContextMenu _dummy = new ContextMenu(); private readonly ContextMenu _dummy = new ContextMenu();
@ -138,9 +128,6 @@ namespace GreenshotPlugin.Controls {
KeyUp += HotkeyControl_KeyUp; KeyUp += HotkeyControl_KeyUp;
KeyDown += HotkeyControl_KeyDown; KeyDown += HotkeyControl_KeyDown;
// Fill the ArrayLists that contain all invalid hotkey combinations
_needNonShiftModifier = new ArrayList();
_needNonAltGrModifier = new ArrayList();
PopulateModifierLists(); PopulateModifierLists();
} }
@ -180,8 +167,6 @@ namespace GreenshotPlugin.Controls {
_needNonShiftModifier.Add((int)Keys.Return); _needNonShiftModifier.Add((int)Keys.Return);
_needNonShiftModifier.Add((int)Keys.Escape); _needNonShiftModifier.Add((int)Keys.Escape);
_needNonShiftModifier.Add((int)Keys.NumLock); _needNonShiftModifier.Add((int)Keys.NumLock);
_needNonShiftModifier.Add((int)Keys.Scroll);
_needNonShiftModifier.Add((int)Keys.Pause);
// Ctrl+Alt + 0 - 9 // Ctrl+Alt + 0 - 9
for (Keys k = Keys.D0; k <= Keys.D9; k++) { for (Keys k = Keys.D0; k <= Keys.D9; k++) {