gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 19:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improvement of attributed string loading and attachment display in text

Browse source 
view.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27705 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2009-01-27 19:16:04 +00:00
parent 0039705817
commit a8bda5f526
6 changed files with 324 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

89
Source/NSLayoutManager.m
View file

@ -1275,6 +1275,56 @@ container
}
}
static inline NSSize
attachmentSize(linefrag_t *lf, NSUInteger glyphIndex)
{
linefrag_attachment_t *la;
int la_i;
la = lf->attachments;
la_i = 0;
while (la->pos != glyphIndex && la_i < lf->num_attachments)
{
la++;
la_i++;
}
if (la_i >= lf->num_attachments)
return NSMakeSize(-1.0, -1.0);
return la->size;
}
- (NSSize) attachmentSizeForGlyphAtIndex: (NSUInteger)glyphIndex
{
textcontainer_t *tc;
int i;
linefrag_t *lf;
for (i = 0, tc = textcontainers; i < num_textcontainers; i++, tc++)
if (tc->pos + tc->length > glyphIndex)
break;
if (i == num_textcontainers)
{
NSLog(@"%s: can't find text container for glyph (internal error)", __PRETTY_FUNCTION__);
return NSMakeSize(-1.0, -1.0);
}
LINEFRAG_FOR_GLYPH(glyphIndex);
return attachmentSize(lf, glyphIndex);
}
- (void) showAttachmentCell: (NSCell *)cell
inRect: (NSRect)rect
characterIndex: (NSUInteger)attachmentIndex
{
[(id <NSTextAttachmentCell>)cell drawWithFrame: rect
inView: [NSView focusView]
characterIndex: attachmentIndex
layoutManager: self];
}
-(void) drawGlyphsForGlyphRange: (NSRange)range
atPoint: (NSPoint)containerOrigin
@ -1284,9 +1334,6 @@ container
linefrag_t *lf;
linefrag_point_t *lp;
linefrag_attachment_t *la;
int la_i;
NSPoint p;
unsigned int g;
@ -1316,8 +1363,6 @@ container
int gbuf_len, gbuf_size;
NSPoint gbuf_point = NSZeroPoint;
NSView *controlView = nil;
if (!range.length)
return;
[self _doLayoutToGlyph: range.location + range.length - 1];
@ -1356,9 +1401,6 @@ container
LINEFRAG_FOR_GLYPH(range.location);
la = lf->attachments;
la_i = 0;
j = 0;
lp = lf->points;
while (lp->pos + lp->length < range.location)
@ -1451,8 +1493,6 @@ container
lf++;
j = 0;
lp = lf->points;
la = lf->attachments;
la_i = 0;
}
p = lp->p;
p.x += lf->rect.origin.x + containerOrigin.x;
@ -1502,9 +1542,7 @@ container
{
if (glyph->g == GSAttachmentGlyph)
{
/* Silently ignore if we don't have any size information for
it. */
if (g >= range.location && la)
if (g >= range.location)
{
unsigned int char_index =
[self characterRangeForGlyphRange: NSMakeRange(g, 1)
@ -1514,21 +1552,15 @@ container
effectiveRange: NULL] attachmentCell];
NSRect cellFrame;
if (!controlView)
controlView = [NSView focusView];
while (la->pos != g && la_i < lf->num_attachments)
{
la++;
la_i++;
}
if (la_i >= lf->num_attachments)
continue;
cellFrame.origin = p;
cellFrame.size = la->size;
cellFrame.size = attachmentSize(lf, g);
cellFrame.origin.y -= cellFrame.size.height;
/* Silently ignore if we don't have any size information for
it. */
if (NSEqualSizes(cellFrame.size, NSMakeSize(-1.0, -1.0)))
continue;
/* Drawing the cell might mess up our state, so we reset
the font and color afterwards. */
/* TODO:
@ -1540,10 +1572,9 @@ container
should they really be drawn in our coordinate system?
*/
[cell drawWithFrame: cellFrame
inView: controlView
characterIndex: char_index
layoutManager: self];
[self showAttachmentCell: (NSCell*)cell
inRect: cellFrame
characterIndex: char_index];
[f set];
[color set];
}