github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 13:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug #3578325, editor size doesn't to capture.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2160 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-10-19 11:50:45 +00:00
commit f6be666aab
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Greenshot/Forms/ImageEditorForm.cs
View file

@ -93,16 +93,16 @@ namespace Greenshot {
IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration); IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration);
// Make sure the editor is placed on the same location as the last editor was on close
WindowDetails thisForm = new WindowDetails(this.Handle);
thisForm.SetWindowPlacement(editorConfiguration.GetEditorPlacement());
// init surface // init surface
Surface = iSurface; Surface = iSurface;
// Intial "saved" flag for asking if the image needs to be save // Intial "saved" flag for asking if the image needs to be save
surface.Modified = !outputMade; surface.Modified = !outputMade;
updateUI();
// Make sure the editor is placed on the same location as the last editor was on close updateUI();
WindowDetails thisForm = new WindowDetails(this.Handle);
thisForm.SetWindowPlacement(editorConfiguration.GetEditorPlacement());
// Workaround: As the cursor is (mostly) selected on the surface a funny artifact is visible, this fixes it. // Workaround: As the cursor is (mostly) selected on the surface a funny artifact is visible, this fixes it.
hideToolstripItems(); hideToolstripItems();
@ -791,6 +791,9 @@ namespace Greenshot {
#region helpers #region helpers
private void updateUndoRedoSurfaceDependencies() { private void updateUndoRedoSurfaceDependencies() {
if (surface == null) {
return;
}
bool canUndo = surface.CanUndo; bool canUndo = surface.CanUndo;
this.btnUndo.Enabled = canUndo; this.btnUndo.Enabled = canUndo;
this.undoToolStripMenuItem.Enabled = canUndo; this.undoToolStripMenuItem.Enabled = canUndo;
@ -820,6 +823,9 @@ namespace Greenshot {
} }
private void updateClipboardSurfaceDependencies() { private void updateClipboardSurfaceDependencies() {
if (surface == null) {
return;
}
// check dependencies for the Surface // check dependencies for the Surface
bool hasItems = surface.HasSelectedElements(); bool hasItems = surface.HasSelectedElements();
bool actionAllowedForSelection = hasItems && !controlsDisabledDueToConfirmable; bool actionAllowedForSelection = hasItems && !controlsDisabledDueToConfirmable;