github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
parent 2a8e2475d8
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Greenshot/Forms/ImageEditorForm.cs
View file

@ -90,7 +90,6 @@ namespace Greenshot {
var thread = new Thread(delegate() {AddDestinations();});
thread.Name = "add destinations";
thread.Start();
IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration);
};
// Make sure the editor is placed on the same location as the last editor was on close
@ -356,18 +355,6 @@ namespace Greenshot {
ImageEditorFormResize(sender, new EventArgs());
}
private void ReloadConfiguration(object source, FileSystemEventArgs e) {
this.Invoke((MethodInvoker) delegate {
// Even update language when needed
ApplyLanguage();
// Fix title
if (surface != null && surface.CaptureDetails != null && surface.CaptureDetails.Title != null) {
this.Text = surface.CaptureDetails.Title + " - " + Language.GetString(LangKey.editor_title);
}
});
}
public ISurface Surface {
get {
return surface;
@ -680,7 +667,6 @@ namespace Greenshot {
}
void ImageEditorFormFormClosing(object sender, FormClosingEventArgs e) {
IniConfig.IniChanged -= new FileSystemEventHandler(ReloadConfiguration);
if (surface.Modified && !editorConfiguration.SuppressSaveDialogAtClose) {
// Make sure the editor is visible
WindowDetails.ToForeground(this.Handle);
@ -1277,13 +1263,16 @@ namespace Greenshot {
}
private void ImageEditorFormResize(object sender, EventArgs e) {
if (this.Surface == null) {
if (this.Surface == null || this.Surface.Image == null || this.panel1 == null) {
return;
}
Size imageSize = this.Surface.Image.Size;
Size currentClientSize = this.panel1.ClientSize;
var canvas = this.Surface as Control;
Panel panel = (Panel)canvas.Parent;
if (panel == null) {
return;
}
int offsetX = -panel.HorizontalScroll.Value;
int offsetY = -panel.VerticalScroll.Value;
if (canvas != null) {