codello/mathpad
Archived
1
Fork 0
Code Releases 1 Activity

Corrected Selection Errors

Browse Source
This commit is contained in:
Kim Wittenburg
2014-09-09 09:23:57 +02:00
parent 91320385f0
commit f791213127
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MathPad/MPExpressionLayout.m
View File

@@ -184,17 +184,20 @@
elementBounds.origin.x += elementOffset.x; elementBounds.origin.x += elementOffset.x;
elementBounds.origin.y += elementOffset.y; elementBounds.origin.y += elementOffset.y;
// Only the horizontal location is to consider for hit testing
elementBounds.size.height = CGFLOAT_MAX;
id<MPExpressionElement> element = [self.expression elementAtIndex:index]; id<MPExpressionElement> element = [self.expression elementAtIndex:index];
if (NSMouseInRect(point, elementBounds, self.flipped)) { if (NSMouseInRect(point, elementBounds, self.flipped)) {
NSPoint pointInElement = NSMakePoint(point.x - elementOffset.x, point.y + elementOffset.y);
if ([element isString]) { if ([element isString]) {
CTLineRef line = [self lineForElementAtIndex:index]; CTLineRef line = [self lineForElementAtIndex:index];
CFRetain(line); CFRetain(line);
CFIndex localIndex = CTLineGetStringIndexForPosition(line, point); CFIndex localIndex = CTLineGetStringIndexForPosition(line, pointInElement);
CFRelease(line); CFRelease(line);
return [NSIndexPath indexPathWithIndex:currentPosition+localIndex]; return [NSIndexPath indexPathWithIndex:currentPosition+localIndex];
} else { } else {
NSPoint pointInFunction = NSMakePoint(point.x - elementOffset.x, point.y + elementOffset.y); NSIndexPath *subPath = [[self childLayoutAtIndex:index] indexPathForMousePoint:pointInElement];
NSIndexPath *subPath = [[self childLayoutAtIndex:index] indexPathForMousePoint:pointInFunction];
if (subPath.length == 1) { if (subPath.length == 1) {
// A single index is used to communicate back wether the // A single index is used to communicate back wether the
// selection should be before or after the function. // selection should be before or after the function.

2
MathPad/MPLayout.h
View File

@@ -40,6 +40,8 @@
replacementLength:(NSUInteger)replacementLength; replacementLength:(NSUInteger)replacementLength;
- (void)invalidate; - (void)invalidate;
- (MPLayout *)childLayoutAtIndexPath:(NSIndexPath *)indexPath;
#pragma mark Calculation and Drawing Methods #pragma mark Calculation and Drawing Methods
- (CTLineRef)createLineForString:(NSString *)aString; - (CTLineRef)createLineForString:(NSString *)aString;

9
MathPad/MPLayout.m
View File

@@ -127,6 +127,15 @@
[self.parent invalidate]; [self.parent invalidate];
} }
- (MPLayout *)childLayoutAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.length == 0) {
return self;
}
MPLayout *child = [self childLayoutAtIndex:indexPath.firstIndex];
return [child childLayoutAtIndexPath:[indexPath indexPathByRemovingFirstIndex]];
}
#pragma mark Calculation and Drawing Methods #pragma mark Calculation and Drawing Methods
- (CTLineRef)createLineForString:(NSString *)aString - (CTLineRef)createLineForString:(NSString *)aString
{ {