Commit graph

40 commits

Author SHA1 Message Date
David Ayers
b18f1c4ac4 Header reorganization - Please refer to ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17408 72102866-910b-0410-8b05-ffd578937521
2003-07-31 23:52:10 +00:00
Adam Fedor
6be9174933 Include <> -> ""
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16917 72102866-910b-0410-8b05-ffd578937521
2003-06-13 15:01:12 +00:00
Adam Fedor
709f0a2379 Make sure view exists before trying to get range (Solaris limitation).
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15259 72102866-910b-0410-8b05-ffd578937521
2002-12-06 02:05:39 +00:00
Adam Fedor
f5018416a5 Fix solaris problem
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15251 72102866-910b-0410-8b05-ffd578937521
2002-12-05 04:50:30 +00:00
Fred Kiefer
1d9f4b6f52 Removed compiler warnings by correcting method names.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14971 72102866-910b-0410-8b05-ffd578937521
2002-11-11 00:14:04 +00:00
Nicola Pero
a8fd7206bd Renamed an ivar; fixed positioning of insertion point when clicking
after the last char (or before the first char) of a line


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14619 72102866-910b-0410-8b05-ffd578937521
2002-10-01 16:19:01 +00:00
Pierre-Yves Rivaille
46630bd6de * Source/NSText.m ([NSText -initWithCoder:]):
Retain the decoded background color.

	* Source/NSTextView.m :
	multiple location: don't ignore textContainer's inset
	([NSTextView -initWithCoder:])
	([NSTextView -encodeWithCoder:])
	Encode caret color, textContainer's size and whether the
	textContainer has widthTracksTextView or heightTracksTextView set.
	([NSTextView -sizeToFit]) Change width (height) only if
	is_horizontally_resizable (is_vertically_resizable).
	([NSTextView -scrollRangeToVisible:]) scrolls to the first char of
	the range.
	([NSTextView -invalidateTextContainerOrigin]): Don't ignore inset,
	set the origin so that the justification is preserved even if the
	textContainer's width is larger that the textview's width.
	([NSTextView -updateInsertionPointStateAndRestartTimer:]):
	update and place the insertion point properly.
	([NSTextView -moveDown:]) & ([NSTextView -moveUp:]):
	Don't ignore inset. Make insertion point visible.

	* Source/NSTextField.m ([NSTextField -acceptsFirstResponder:]):
	responds NO if the editing is still in progrss.

	* Source/NSLayoutManager.m
	([NSLayoutManager -drawBackgroundForGlyphRange:atPoint:]):
	Don't ignore textContainer's inset.

	* Source/GSSimpleLayoutManager.m
	Replaced [-drawLinesInLineRange:] with [-drawLinesInLineRange:atPoint:].
	Replaced [-drawSelectionAsRangeNoCaret:] with
	[-drawSelectionAsRangeNoCaret:atPoint:].
	Those replacements make it easier to take inset into account.
	([-lineFragmentUsedRectForGlyphAtIndex:effectiveRange:])
	([-locationForGlyphAtIndex:])
	([-boundingRectForGlyphRange:inTextContainer:])
	([-rectForCharacterIndex:])
	([-setNeedsDisplayForLineRange:inTextContainer:]):
	Various fixes.
	([-textStorage:edited:range:changeInLength:invalidatedRange:])
	Update insertion point if needed (useful when alignment changes).
	([-rebuildForRange:delta:inTextContainer:]):
	Update layout mechanism.

	* Source/NSCell.m
	([NSCell -highlight:withFrame:inView:]):
	Ask the control to draw the background if we are not opaque.
	([NSCell -editWithFrame:inView:editor:delegate:event:]):
	([NSCell -selectWithFrame:inView:editor:delegate:start:length:]):
	([NSCell -endEditing:]):
	instantiate (and remove) the textview so that it can be scrolled.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14429 72102866-910b-0410-8b05-ffd578937521
2002-09-11 20:26:27 +00:00
Pierre-Yves Rivaille
d56846ede3 Source/GSSimpleLayoutManager.m
Source/NSMatrix.m
Source/NSButtonCell.m


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14133 72102866-910b-0410-8b05-ffd578937521
2002-07-11 19:53:15 +00:00
Nicola Pero
e7ed1ed865 Do not use hardcoded 12 height of default font, but retrieve it from NSFont
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13960 72102866-910b-0410-8b05-ffd578937521
2002-06-24 12:22:12 +00:00
Nicola Pero
0d7e20cacf More careful checking for the special case of no text
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13683 72102866-910b-0410-8b05-ffd578937521
2002-05-22 12:35:10 +00:00
Nicola Pero
78174f287d Indented line
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13677 72102866-910b-0410-8b05-ffd578937521
2002-05-22 11:45:48 +00:00
Nicola Pero
dfedc46765 Fixed typo in last commit
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13224 72102866-910b-0410-8b05-ffd578937521
2002-03-25 02:27:35 +00:00
Nicola Pero
8564eb7342 Made a check for line range stricter ... apparently because of a bug
elsewhere, the stricter check is needed to prevent a crash


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13202 72102866-910b-0410-8b05-ffd578937521
2002-03-22 11:46:08 +00:00
Adam Fedor
368fa049c1 Check for nil object before assigning struct
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13059 72102866-910b-0410-8b05-ffd578937521
2002-03-09 17:24:53 +00:00
Fred Kiefer
d763179059 [_relocLayoutArray:offset:floatTrift:Change a NSLog() call to NSDebugLog().
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12856 72102866-910b-0410-8b05-ffd578937521
2002-02-27 23:35:05 +00:00
Richard Frith-Macdonald
ae8ea4d667 Glyph handling improvments.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12570 72102866-910b-0410-8b05-ffd578937521
2002-02-20 08:52:39 +00:00
Nicola Pero
ae95ed3ec9 Fixed method returning a text container for when there is no text
container set ... typically happening during text system setup


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12480 72102866-910b-0410-8b05-ffd578937521
2002-02-11 02:00:35 +00:00
Nicola Pero
638a861702 Code moved and cleaned a bit
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12425 72102866-910b-0410-8b05-ffd578937521
2002-02-06 19:21:29 +00:00
Nicola Pero
42b0b2ef67 Fixed bug when typing enter at the end of text; fixed drawing insertion
point when there is no text


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12414 72102866-910b-0410-8b05-ffd578937521
2002-02-06 01:39:11 +00:00
Nicola Pero
5198e15983 Indentation changes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12413 72102866-910b-0410-8b05-ffd578937521
2002-02-06 01:06:03 +00:00
Nicola Pero
0b806e1512 Indentation tidyup
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11768 72102866-910b-0410-8b05-ffd578937521
2001-12-15 10:30:53 +00:00
Nicola Pero
a8e28ba039 Minor indentation tidyups
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11313 72102866-910b-0410-8b05-ffd578937521
2001-11-05 11:47:29 +00:00
Nicola Pero
420c1a2dfb Little indentation tidyupy
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11312 72102866-910b-0410-8b05-ffd578937521
2001-11-05 11:46:24 +00:00
Fred Kiefer
632ec4278e [GSSimpleLayoutManager boundingRectForGlyphRange:inTextContainer:]:
Use lineFragmentRect instead of usedRect, so that the full line
gets cleared. This still is not correct for all cases.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10955 72102866-910b-0410-8b05-ffd578937521
2001-09-23 22:09:48 +00:00
Nicola Pero
63d0ee2c7c Little improvement of the description of the _GNULineLayoutInfo objects -
changing mainly using for debugging


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10818 72102866-910b-0410-8b05-ffd578937521
2001-08-30 20:20:49 +00:00
Nicola Pero
64720d2a5e Indentation tidyup
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10817 72102866-910b-0410-8b05-ffd578937521
2001-08-30 20:14:50 +00:00
Richard Frith-Macdonald
4adb0bb3b0 Patch from George to fix bounding rect stuff
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10525 72102866-910b-0410-8b05-ffd578937521
2001-07-20 05:33:07 +00:00
Adam Fedor
a56278096e Merge from 0.7.0
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10329 72102866-910b-0410-8b05-ffd578937521
2001-07-09 02:49:03 +00:00
Nicola Pero
2ef65f8a58 Indentation tidied
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10027 72102866-910b-0410-8b05-ffd578937521
2001-05-28 22:20:59 +00:00
Nicola Pero
9e3cb35e61 Added method to move cursor up or down; fixed bug
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8588 72102866-910b-0410-8b05-ffd578937521
2001-01-14 11:28:26 +00:00
Nicola Pero
0fe5dd2861 Added invalidation of text position during editing
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8482 72102866-910b-0410-8b05-ffd578937521
2001-01-07 00:53:53 +00:00
Richard Frith-MacDonald
afc3dfd686 More selection fixes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8451 72102866-910b-0410-8b05-ffd578937521
2000-12-27 07:39:25 +00:00
Fred Kiefer
f5a8d938aa Renamed the ivars of _GNULineLayoutInfo to correspond to those of
GSLineLayoutInfo. Call a few more abstract methods. Added
AutoreleasePool in [rebuildForRange:delta:inTextContainer:] to free
up memory.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8081 72102866-910b-0410-8b05-ffd578937521
2000-11-12 13:54:54 +00:00
Fred Kiefer
d8c43999c1 Get the fragmentRect used for layout from the text container
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8061 72102866-910b-0410-8b05-ffd578937521
2000-11-06 22:11:26 +00:00
Fred Kiefer
eaeca6efb0 Call size to fit on view after layout changes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8033 72102866-910b-0410-8b05-ffd578937521
2000-11-05 16:21:47 +00:00
Fred Kiefer
fd834fe526 Removed some 300 lines
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7995 72102866-910b-0410-8b05-ffd578937521
2000-11-03 00:20:06 +00:00
Fred Kiefer
b682bebc80 _GNULineLayoutInfo has new ivar usedRect. Simplified the code a bit.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7894 72102866-910b-0410-8b05-ffd578937521
2000-10-23 23:24:22 +00:00
Nicola Pero
50f657f4c9 Prefixed ivar with underscore to keep it to compile
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7804 72102866-910b-0410-8b05-ffd578937521
2000-10-13 10:03:36 +00:00
Fred Kiefer
96d2900f7d Switched to use the text container for size information.
Implemented [textContainerChangedGeometry].


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7677 72102866-910b-0410-8b05-ffd578937521
2000-09-30 23:13:41 +00:00
Fred Kiefer
40aa76c126 New file extracted from NSText.m. This class is now a subclass of
NSLayoutManager and uses a similar interface.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7541 72102866-910b-0410-8b05-ffd578937521
2000-09-18 23:31:39 +00:00