CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 09:17:36 +13:00
Code Issues Projects Releases Packages Wiki Activity

Don't show hover selection of windows and controls when select tool is active

Browse source
This commit is contained in:
Jaex 2019-04-14 10:17:12 +03:00
parent 7b107fcd31
commit 552c898864
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -3132,7 +3132,7 @@ internal static string ShapeType_RegionRectangle {
}
/// <summary>
/// Looks up a localized string similar to Tool: Crop image (C).
/// Looks up a localized string similar to Crop image (C).
/// </summary>
internal static string ShapeType_ToolCrop {
get {
@ -3141,7 +3141,7 @@ internal static string ShapeType_ToolCrop {
}
/// <summary>
/// Looks up a localized string similar to Select and Move (M).
/// Looks up a localized string similar to Select and move (M).
/// </summary>
internal static string ShapeType_ToolSelect {
get {

4
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -1074,7 +1074,7 @@ Would you like to download and install it?</value>
<value>1 Week</value>
</data>
<data name="ShapeType_ToolSelect" xml:space="preserve">
<value>Select and Move (M)</value>
<value>Select and move (M)</value>
</data>
<data name="ShapeType_DrawingRectangle" xml:space="preserve">
<value>Drawing: Rectangle (R)</value>
@ -1146,7 +1146,7 @@ Would you like to download and install it?</value>
<value>Upload text</value>
</data>
<data name="ShapeType_ToolCrop" xml:space="preserve">
<value>Tool: Crop image (C)</value>
<value>Crop image (C)</value>
</data>
<data name="HotkeyType_UploadURL" xml:space="preserve">
<value>Upload from URL</value>

4
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -72,7 +72,7 @@ public ShapeType CurrentTool
{
if (currentTool == value) return;
var previousTool = currentTool;
ShapeType previousTool = currentTool;
currentTool = value;
if (Form.IsAnnotationMode)
@ -1155,6 +1155,7 @@ private BaseShape CheckHover()
case ShapeType.DrawingImage:
case ShapeType.DrawingSticker:
case ShapeType.DrawingCursor:
case ShapeType.ToolSelect:
return null;
}
@ -1259,6 +1260,7 @@ private void SelectShape(BaseShape shape)
if (shape != null)
{
shape.ShowNodes();
if (Options.SwitchToDrawingToolAfterSelection)
{
CurrentTool = shape.ShapeType;

1
ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs
View file

@ -114,6 +114,7 @@ private void CancelButton_MousePressed(object sender, MouseEventArgs e)
public override void Remove()
{
base.Remove();
if (Options.SwitchToSelectionToolAfterDrawing)
{
Manager.CurrentTool = ShapeType.ToolSelect;