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

Fixed [#1469] by checking if there are grippers.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2516 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-03-06 19:31:07 +00:00
parent 15605cee62
commit 1057d5f23a
3 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Greenshot/Drawing/DrawableContainer.cs
View file

@ -323,6 +323,9 @@ namespace Greenshot.Drawing {
}
protected virtual void DoLayout() {
if (grippers == null) {
return;
}
if (!layoutSuspended) {
int[] xChoords = new int[]{this.Left-2,this.Left+this.Width/2-2,this.Left+this.Width-2};
int[] yChoords = new int[]{this.Top-2,this.Top+this.Height/2-2,this.Top+this.Height-2};
@ -471,17 +474,24 @@ namespace Greenshot.Drawing {
}
public virtual void ShowGrippers() {
for (int i=0; i<grippers.Length; i++) {
if(grippers[i].Enabled) grippers[i].Show();
else grippers[i].Hide();
if (grippers != null) {
for (int i = 0; i < grippers.Length; i++) {
if (grippers[i].Enabled) {
grippers[i].Show();
} else {
grippers[i].Hide();
}
}
}
this.ResumeLayout();
}
public void HideGrippers() {
this.SuspendLayout();
for (int i=0; i<grippers.Length; i++) {
grippers[i].Hide();
if (grippers != null) {
for (int i = 0; i < grippers.Length; i++) {
grippers[i].Hide();
}
}
}
@ -554,11 +564,11 @@ namespace Greenshot.Drawing {
}
private void SwitchParent(Surface newParent) {
if (parent != null) {
if (parent != null && grippers != null) {
for (int i=0; i<grippers.Length; i++) {
parent.Controls.Remove(grippers[i]);
}
} else if(grippers == null) {
} else if (grippers == null) {
InitControls();
}
parent = newParent;