mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-02-24 03:51:22 +00:00
Matrix cntl-drag fixes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@14873 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
01eee8a433
commit
4d7ac746c7
3 changed files with 17 additions and 1716 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2002-10-29 Adam Fedor <fedor@gnu.org>
|
||||||
|
|
||||||
|
* GormMatrixEditor.m (-_constrainedFrame:framewithEvent:andKnob:knob):
|
||||||
|
Set height/width to 0 when rows/cols = 1.
|
||||||
|
(-validateFrame:framewithEvent:theEventandPlacementInfo:): Idem.
|
||||||
|
* GormWindowEditor.m: Remove commented out code.
|
||||||
|
|
||||||
2002-10-29 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
|
2002-10-29 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
|
||||||
|
|
||||||
* GormDocument.m: change nameTable retaining policy from
|
* GormDocument.m: change nameTable retaining policy from
|
||||||
|
|
|
@ -491,15 +491,16 @@ static BOOL done_editing;
|
||||||
int cols = [_EO numberOfColumns];
|
int cols = [_EO numberOfColumns];
|
||||||
NSSize cellSize = [_EO cellSize];
|
NSSize cellSize = [_EO cellSize];
|
||||||
|
|
||||||
|
height = width = 0;
|
||||||
width = ( frame.size.width - cellSize.width * cols) / (cols - 1);
|
if (cols > 1)
|
||||||
height = ( frame.size.height - cellSize.height * rows ) / (rows - 1);
|
width = ( frame.size.width - cellSize.width * cols) / (cols - 1);
|
||||||
|
if (rows > 1)
|
||||||
|
height = ( frame.size.height - cellSize.height * rows ) / (rows - 1);
|
||||||
|
|
||||||
width *= (cols - 1);
|
width *= (cols - 1);
|
||||||
width += cellSize.width * cols;
|
width += cellSize.width * cols;
|
||||||
height *= (rows - 1);
|
height *= (rows - 1);
|
||||||
height += cellSize.height * rows;
|
height += cellSize.height * rows;
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -643,8 +644,11 @@ static BOOL done_editing;
|
||||||
[self setFrame: frame];
|
[self setFrame: frame];
|
||||||
|
|
||||||
|
|
||||||
width = ( frame.size.width - cellSize.width * cols) / (cols - 1);
|
height = width = 0;
|
||||||
height = ( frame.size.height - cellSize.height * rows ) / (rows - 1);
|
if (cols > 1)
|
||||||
|
width = ( frame.size.width - cellSize.width * cols) / (cols - 1);
|
||||||
|
if (rows > 1)
|
||||||
|
height = ( frame.size.height - cellSize.height * rows ) / (rows - 1);
|
||||||
|
|
||||||
[_EO setIntercellSpacing: NSMakeSize(width, height)];
|
[_EO setIntercellSpacing: NSMakeSize(width, height)];
|
||||||
}
|
}
|
||||||
|
|
1710
GormWindowEditor.m
1710
GormWindowEditor.m
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue