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

Removed the PictureBox from the Surface, meaning that the Surface is now just a Control, this should simplify the event stack and other logic and give us more control.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2099 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-09-26 12:51:01 +00:00
commit 7bb187ce71
2 changed files with 50 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Greenshot/Drawing/Surface.cs
View file

@ -47,7 +47,7 @@ namespace Greenshot.Drawing {
/// <summary> /// <summary>
/// Description of Surface. /// Description of Surface.
/// </summary> /// </summary>
public class Surface : PictureBox, ISurface { public class Surface : Control, ISurface {
private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Surface)); private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(Surface));
private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>(); private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
@ -188,7 +188,8 @@ namespace Greenshot.Drawing {
private TextureBrush transparencyBackgroundBrush; private TextureBrush transparencyBackgroundBrush;
/// <summary> /// <summary>
/// The buffer is only for drawing on it, saving a lot of "create new bitmap" commands /// The buffer is only for drawing on it when using filters (to supply access)
/// This saves a lot of "create new bitmap" commands
/// Should not be serialized, as it's generated. /// Should not be serialized, as it's generated.
/// The actual bitmap is in the paintbox... /// The actual bitmap is in the paintbox...
/// TODO: Check if this buffer is still needed! /// TODO: Check if this buffer is still needed!
@ -224,6 +225,20 @@ namespace Greenshot.Drawing {
/// </summary> /// </summary>
private bool modified = true; private bool modified = true;
/// <summary>
/// The image is the actual captured image, needed with serialization
/// </summary>
private Image image = null;
public Image Image {
get {
return image;
}
set {
image = value;
}
}
public FieldAggregator FieldAggregator { public FieldAggregator FieldAggregator {
get { get {
return fieldAggregator; return fieldAggregator;
@ -310,7 +325,6 @@ namespace Greenshot.Drawing {
public Surface() : base(){ public Surface() : base(){
LOG.Debug("Creating a surface!"); LOG.Debug("Creating a surface!");
this.SizeMode = PictureBoxSizeMode.AutoSize;
this.MouseDown += new MouseEventHandler(SurfaceMouseDown); this.MouseDown += new MouseEventHandler(SurfaceMouseDown);
this.MouseUp += new MouseEventHandler(SurfaceMouseUp); this.MouseUp += new MouseEventHandler(SurfaceMouseUp);
this.MouseMove += new MouseEventHandler(SurfaceMouseMove); this.MouseMove += new MouseEventHandler(SurfaceMouseMove);
@ -319,10 +333,14 @@ namespace Greenshot.Drawing {
this.AllowDrop = true; this.AllowDrop = true;
this.DragDrop += new DragEventHandler(OnDragDrop); this.DragDrop += new DragEventHandler(OnDragDrop);
this.DragEnter += new DragEventHandler(OnDragEnter); this.DragEnter += new DragEventHandler(OnDragEnter);
// bind selected & elements to this, otherwise they can't inform of modifications // bind selected & elements to this, otherwise they can't inform of modifications
selectedElements.Parent = this; this.selectedElements.Parent = this;
elements.Parent = this; this.elements.Parent = this;
// Make sure we are visible
this.Visible = true;
// Enable double buffering
this.DoubleBuffered = true;
this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint | ControlStyles.ResizeRedraw | ControlStyles.ContainerControl | ControlStyles.OptimizedDoubleBuffer | ControlStyles.SupportsTransparentBackColor, true);
} }
/// <summary> /// <summary>
@ -330,20 +348,22 @@ namespace Greenshot.Drawing {
/// </summary> /// </summary>
/// <param name="image">The new image</param> /// <param name="image">The new image</param>
/// <param name="dispose">true if the old image needs to be disposed, when using undo this should not be true!!</param> /// <param name="dispose">true if the old image needs to be disposed, when using undo this should not be true!!</param>
private void SetImage(Image image, bool dispose) { private void SetImage(Image newImage, bool dispose) {
// Dispose // Dispose
if (Image != null && dispose) { if (image != null && dispose) {
Image.Dispose(); image.Dispose();
} }
// Set new values // Set new values
Image = image; Image = newImage;
Size = newImage.Size;
modified = true; modified = true;
} }
public Surface(Image image) : this() { public Surface(Image newImage) : this() {
LOG.Debug("Got image with dimensions " + image.Width + "," + image.Height + " bpp: " + image.PixelFormat); LOG.Debug("Got image with dimensions " + newImage.Width + "," + newImage.Height + " bpp: " + newImage.PixelFormat);
SetImage(image, true); SetImage(newImage, true);
} }
public Surface(ICapture capture) : this(capture.Image) { public Surface(ICapture capture) : this(capture.Image) {
@ -651,8 +671,7 @@ namespace Greenshot.Drawing {
e.Effect=DragDropEffects.None; e.Effect=DragDropEffects.None;
} else { } else {
List<string> filenames = GetFilenames(e); List<string> filenames = GetFilenames(e);
//|| e.Data.GetDataPresent(DataFormats.EnhancedMetafile, true) if ((filenames != null && filenames.Count > 0) || e.Data.GetDataPresent(DataFormats.Bitmap, true) || e.Data.GetDataPresent(DataFormats.EnhancedMetafile, true)) {
if ( (filenames != null && filenames.Count > 0) || e.Data.GetDataPresent(DataFormats.Bitmap, true) || e.Data.GetDataPresent(DataFormats.EnhancedMetafile, true)) {
e.Effect=DragDropEffects.Copy; e.Effect=DragDropEffects.Copy;
} else { } else {
e.Effect=DragDropEffects.None; e.Effect=DragDropEffects.None;
@ -664,7 +683,7 @@ namespace Greenshot.Drawing {
List<string> filenames = GetFilenames(e); List<string> filenames = GetFilenames(e);
Point mouse = this.PointToClient(new Point(e.X, e.Y)); Point mouse = this.PointToClient(new Point(e.X, e.Y));
if ((filenames != null && filenames.Count > 0)) { if ((filenames != null && filenames.Count > 0)) {
foreach(string filename in filenames) { foreach (string filename in filenames) {
if (filename != null && filename.Trim().Length > 0) { if (filename != null && filename.Trim().Length > 0) {
LOG.Debug("Drop - filename: " + filename); LOG.Debug("Drop - filename: " + filename);
if (filename.ToLower().EndsWith("wmf")) { if (filename.ToLower().EndsWith("wmf")) {
@ -1031,12 +1050,12 @@ namespace Greenshot.Drawing {
Cursor = Cursors.Default; Cursor = Cursors.Default;
} }
if(mouseDown) { if (mouseDown) {
if(mouseDownElement != null) { // an element is currently dragged if (mouseDownElement != null) { // an element is currently dragged
mouseDownElement.Invalidate(); mouseDownElement.Invalidate();
selectedElements.HideGrippers(); selectedElements.HideGrippers();
// Move the element // Move the element
if(mouseDownElement.Selected) { if (mouseDownElement.Selected) {
if (!isSurfaceMoveMadeUndoable) { if (!isSurfaceMoveMadeUndoable) {
// Only allow one undoable per mouse-down/move/up "cycle" // Only allow one undoable per mouse-down/move/up "cycle"
isSurfaceMoveMadeUndoable = true; isSurfaceMoveMadeUndoable = true;
@ -1070,7 +1089,7 @@ namespace Greenshot.Drawing {
private Image GetImage(RenderMode renderMode) { private Image GetImage(RenderMode renderMode) {
// Generate a copy of the original image with a dpi equal to the default... // Generate a copy of the original image with a dpi equal to the default...
Bitmap clone = ImageHelper.Clone(Image); Bitmap clone = ImageHelper.Clone(image);
// otherwise we would have a problem drawing the image to the surface... :( // otherwise we would have a problem drawing the image to the surface... :(
using (Graphics graphics = Graphics.FromImage(clone)) { using (Graphics graphics = Graphics.FromImage(clone)) {
// Do not set the following, the containers need to decide themselves // Do not set the following, the containers need to decide themselves
@ -1124,8 +1143,7 @@ namespace Greenshot.Drawing {
} }
targetGraphics.DrawImage(buffer, clipRectangle, clipRectangle, GraphicsUnit.Pixel); targetGraphics.DrawImage(buffer, clipRectangle, clipRectangle, GraphicsUnit.Pixel);
} else { } else {
// Only "simple" elements need to be redrawn, as the image is already drawn before getting the event we don't need the next line: targetGraphics.DrawImage(Image, clipRectangle, clipRectangle, GraphicsUnit.Pixel);
// targetGraphics.DrawImage(Image, clipRectangle, clipRectangle, GraphicsUnit.Pixel);
elements.Draw(targetGraphics, null, RenderMode.EDIT, clipRectangle); elements.Draw(targetGraphics, null, RenderMode.EDIT, clipRectangle);
} }
} }
@ -1267,10 +1285,10 @@ namespace Greenshot.Drawing {
SelectElements(dcs); SelectElements(dcs);
} }
} else if (ClipboardHelper.ContainsImage()) { } else if (ClipboardHelper.ContainsImage()) {
using (Image image = ClipboardHelper.GetImage()) { using (Image clipboardImage = ClipboardHelper.GetImage()) {
if (image != null) { if (clipboardImage != null) {
DeselectAllElements(); DeselectAllElements();
IBitmapContainer bitmapContainer = AddBitmapContainer(image as Bitmap, 0, 0); IBitmapContainer bitmapContainer = AddBitmapContainer(clipboardImage as Bitmap, 0, 0);
SelectElement(bitmapContainer); SelectElement(bitmapContainer);
} }
} }

14
Greenshot/Forms/ImageEditorForm.cs
View file

@ -94,8 +94,8 @@ namespace Greenshot {
// //
// The InitializeComponent() call is required for Windows Forms designer support. // The InitializeComponent() call is required for Windows Forms designer support.
// //
this.ManualLanguageApply = true; this.ManualLanguageApply = true;
InitializeComponent(); InitializeComponent();
updateUI(); updateUI();
this.Load += delegate { this.Load += delegate {
@ -162,11 +162,11 @@ namespace Greenshot {
ApplyLanguage(); ApplyLanguage();
// Fix title // Fix title
if (surface != null && surface.CaptureDetails != null && surface.CaptureDetails.Title != null) { if (surface != null && surface.CaptureDetails != null && surface.CaptureDetails.Title != null) {
this.Text = surface.CaptureDetails.Title + " - " + Language.GetString(LangKey.editor_title); this.Text = surface.CaptureDetails.Title + " - " + Language.GetString(LangKey.editor_title);
} }
} }
/// <summary> /// <summary>
/// Get all the destinations and display them in the file menu and the buttons /// Get all the destinations and display them in the file menu and the buttons