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

Move ScrollbarManager to ShapeManager

Browse source
This commit is contained in:
Jaex 2018-04-03 23:46:38 +03:00
parent d7e369a210
commit 6185385c9b
3 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,6 @@ public Color CurrentColor
private TextAnimation editorPanTipAnimation;
private Bitmap bmpBackgroundImage;
private Cursor defaultCursor;
private ScrollbarManager scrollbarManager;
public RegionCaptureForm(RegionCaptureMode mode, RegionCaptureOptions options, Image canvas = null)
{
@ -129,19 +128,14 @@ public RegionCaptureForm(RegionCaptureMode mode, RegionCaptureOptions options, I
Duration = TimeSpan.FromMilliseconds(200)
};
if (IsEditorMode)
if (IsEditorMode && Options.ShowEditorPanTip)
{
scrollbarManager = new ScrollbarManager(this);
if (Options.ShowEditorPanTip)
editorPanTipAnimation = new TextAnimation()
{
editorPanTipAnimation = new TextAnimation()
{
Duration = TimeSpan.FromMilliseconds(5000),
FadeOutDuration = TimeSpan.FromMilliseconds(1000),
Text = Resources.RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleButtonAndDragging
};
}
Duration = TimeSpan.FromMilliseconds(5000),
FadeOutDuration = TimeSpan.FromMilliseconds(1000),
Text = Resources.RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleButtonAndDragging
};
}
borderPen = new Pen(Color.Black);
@ -673,11 +667,6 @@ private void UpdateCoordinates()
borderDotPen.DashOffset = (float)timerStart.Elapsed.TotalSeconds * -15;
ShapeManager.Update();
if (scrollbarManager != null)
{
scrollbarManager.Update();
}
}
protected override void OnPaintBackground(PaintEventArgs e)
@ -871,12 +860,6 @@ private void Draw(Graphics g)
{
DrawTextAnimation(g, ShapeManager.MenuTextAnimation);
}
// Draw scroll bars
if (scrollbarManager != null)
{
scrollbarManager.Draw(g);
}
}
internal void DrawRegionArea(Graphics g, Rectangle rect, bool isAnimated)

10
ShareX.ScreenCaptureLib/RegionHelpers/ScrollbarManager.cs
View file

@ -35,11 +35,13 @@ internal class ScrollbarManager
private RegionCaptureForm form;
private ImageEditorScrollbar horizontalScrollbar, verticalScrollbar;
public ScrollbarManager(RegionCaptureForm regionCaptureForm)
public ScrollbarManager(RegionCaptureForm regionCaptureForm, ShapeManager shapeManager)
{
form = regionCaptureForm;
horizontalScrollbar = new ImageEditorScrollbar(Orientation.Horizontal, form);
shapeManager.DrawableObjects.Add(horizontalScrollbar);
verticalScrollbar = new ImageEditorScrollbar(Orientation.Vertical, form);
shapeManager.DrawableObjects.Add(verticalScrollbar);
}
public void Update()
@ -47,11 +49,5 @@ public void Update()
horizontalScrollbar.Update();
verticalScrollbar.Update();
}
public void Draw(Graphics g)
{
horizontalScrollbar.OnDraw(g);
verticalScrollbar.OnDraw(g);
}
}
}

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

@ -222,6 +222,7 @@ public bool NodesVisible
internal RegionCaptureForm Form { get; private set; }
private bool isLeftPressed, isRightPressed, isUpPressed, isDownPressed;
private ScrollbarManager scrollbarManager;
public ShapeManager(RegionCaptureForm form)
{
@ -264,6 +265,11 @@ public ShapeManager(RegionCaptureForm form)
{
CurrentTool = ShapeType.RegionRectangle;
}
if (form.IsEditorMode)
{
scrollbarManager = new ScrollbarManager(form, this);
}
}
private void form_Shown(object sender, EventArgs e)
@ -741,6 +747,11 @@ public void Update()
UpdateCurrentHoverShape();
UpdateNodes();
if (scrollbarManager != null)
{
scrollbarManager.Update();
}
}
private void StartRegionSelection()