CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 22:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Also move toolbar when annotate form moved

Browse source
This commit is contained in:
Jaex 2017-10-24 02:43:37 +03:00
parent 48681af900
commit 0c36f82302
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,6 +170,7 @@ private void InitializeComponent()
KeyUp += RegionCaptureForm_KeyUp; KeyUp += RegionCaptureForm_KeyUp;
MouseDown += RegionCaptureForm_MouseDown; MouseDown += RegionCaptureForm_MouseDown;
Resize += RegionCaptureForm_Resize; Resize += RegionCaptureForm_Resize;
LocationChanged += RegionCaptureForm_LocationChanged;
ResumeLayout(false); ResumeLayout(false);
} }
@ -277,6 +278,29 @@ private void CenterCanvas(bool updateCoordinates = true)
} }
} }
private void OnMoved()
{
if (ShapeManager != null)
{
UpdateCoordinates();
if (IsEditorMode && WindowState != lastWindowState)
{
lastWindowState = WindowState;
if (WindowState == FormWindowState.Normal || WindowState == FormWindowState.Maximized)
{
CenterCanvas(false);
}
}
if (IsAnnotationMode && ShapeManager.ToolbarCreated)
{
ShapeManager.UpdateMenuPosition();
}
}
}
public void SetDefaultCursor() public void SetDefaultCursor()
{ {
if (Cursor != defaultCursor) if (Cursor != defaultCursor)
@ -294,22 +318,12 @@ private void RegionCaptureForm_Shown(object sender, EventArgs e)
private void RegionCaptureForm_Resize(object sender, EventArgs e) private void RegionCaptureForm_Resize(object sender, EventArgs e)
{ {
UpdateCoordinates(); OnMoved();
}
if (WindowState != lastWindowState) private void RegionCaptureForm_LocationChanged(object sender, EventArgs e)
{ {
lastWindowState = WindowState; OnMoved();
if (WindowState == FormWindowState.Normal || WindowState == FormWindowState.Maximized)
{
CenterCanvas(false);
}
}
if (IsAnnotationMode && ShapeManager != null && ShapeManager.ToolbarCreated)
{
ShapeManager.UpdateMenuPosition();
}
} }
internal void RegionCaptureForm_KeyDown(object sender, KeyEventArgs e) internal void RegionCaptureForm_KeyDown(object sender, KeyEventArgs e)