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

Fixed fullscreen annotate toolbar not visible

Browse source
This commit is contained in:
Jaex 2017-10-27 08:37:37 +03:00
parent ec9298fd75
commit 360cfab74c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View file

@ -55,6 +55,7 @@ public sealed class RegionCaptureForm : Form
public bool IsEditorMode => Mode == RegionCaptureMode.Editor || Mode == RegionCaptureMode.TaskEditor;
public bool IsAnnotationMode => Mode == RegionCaptureMode.Annotation || IsEditorMode;
public bool IsAnnotated => ShapeManager != null && ShapeManager.IsAnnotated;
public bool IsFullscreen => !IsEditorMode || Config.EditorModeFullscreen;
public Point CurrentPosition { get; private set; }
@ -146,7 +147,7 @@ private void InitializeComponent()
Icon = ShareXResources.Icon;
SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
if (!IsEditorMode || Config.EditorModeFullscreen)
if (IsFullscreen)
{
Text = "ShareX - " + Resources.BaseRegionForm_InitializeComponent_Region_capture;
StartPosition = FormStartPosition.Manual;
@ -154,7 +155,7 @@ private void InitializeComponent()
Bounds = CaptureHelpers.GetScreenBounds();
ShowInTaskbar = false;
#if !DEBUG
TopMost = true;
TopMost = true;
#endif
}
else

2
ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
View file

@ -68,7 +68,7 @@ internal void CreateToolbar()
ShowInTaskbar = false,
StartPosition = FormStartPosition.Manual,
Text = "ShareX - Annotate menu",
TopMost = !form.IsEditorMode
TopMost = form.IsFullscreen
};
menuForm.Shown += MenuForm_Shown;