colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-15 07:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

If the text editing part of the token field is the last in the line, make it take up the remaining field width so that it captures clicks there.

Browse Source
This commit is contained in:
Alexander Ljungberg
2010-10-23 16:58:02 -03:00
parent 7037151bfc
commit 8a7b6054ef
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTokenField.j
+13 -8
View File
@@ -930,15 +930,20 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting",
return r;
}
var placeEditor = function()
var placeEditor = function(useRemainingWidth)
{
var element = [self _inputElement];
// XXX The "X" here is used to estimate the space needed to fit the next character
// without clipping. Since different fonts might have different sizes of "X" this
// solution is not ideal, but it works.
var textWidth = _selectedRange.length ? 1 : [(element.value || @"") + "X" sizeWithFont:[self font]].width,
inputFrame = fitAndFrame(textWidth, tokenHeight);
var textWidth = 1;
if (_selectedRange.length === 0)
{
// XXX The "X" here is used to estimate the space needed to fit the next character
// without clipping. Since different fonts might have different sizes of "X" this
// solution is not ideal, but it works.
textWidth = useRemainingWidth ? contentSize.width - offset.x - 1 : [(element.value || @"") + "X" sizeWithFont:[self font]].width;
}
var inputFrame = fitAndFrame(textWidth, tokenHeight);
element.style.left = inputFrame.origin.x + "px";
element.style.top = inputFrame.origin.y + "px";
@@ -953,7 +958,7 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting",
for (var i = 0, count = [tokens count]; i < count; i++)
{
if (isEditing && i == CPMaxRange(_selectedRange))
placeEditor(i);
placeEditor(false);
var tokenView = [tokens objectAtIndex:i];
@@ -972,7 +977,7 @@ var CPThemeStateAutoCompleting = @"CPThemeStateAutoCompleting",
}
if (isEditing && CPMaxRange(_selectedRange) >= [tokens count])
placeEditor();
placeEditor(true);
// Hide the editor if there are selected tokens, but still keep it active
// so we can continue using our standard keyboard handling events.