Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Text metrics #3

Merged
merged 3 commits into from
Jun 1, 2015
Merged

Text metrics #3

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45b1049
Measuring font height with `Hg`. Using Arial in text box caret tests.
BSick7 Jun 1, 2015
4ca846c
Basing test results off actual font height.
BSick7 Jun 1, 2015
979c117
Basing test results on font height.
BSick7 Jun 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Basing test results on font height.
  • Loading branch information
@BSick7
BSick7 committed Jun 1, 2015
commit 979c117f995f8ea7a46aa5d9ee014d8176829f81
18 changes: 11 additions & 7 deletions test/tests/controls/textboxview/caret.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,19 @@ module minerva.controls.textboxview.caret.tests {
upd.invalidateTextMetrics();
upd.tree.layout(new Size(150, 100), upd.assets);

assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 0, 1, 16));
var fheight = minerva.fontHeight.get(textupd.assets.font);

assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 0, 1, fheight));
upd.assets.selectionStart = 8;
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(mock.measure("Welcome ", textupd.assets.font, true), 0, 1, 16));
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(mock.measure("Welcome ", textupd.assets.font, true), 0, 1, fheight));
upd.assets.selectionStart = 17;
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(mock.measure("Welcome to Fayde.", textupd.assets.font, true), 0, 1, 16));
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(mock.measure("Welcome to Fayde.", textupd.assets.font, true), 0, 1, fheight));

textupd.assets.text = "";
upd.invalidateTextMetrics();
upd.tree.layout(new Size(150, 100), upd.assets);
upd.assets.selectionStart = 0;
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 0, 1, 16));
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 0, 1, fheight));
});

QUnit.test("getCaretFromCursor - Line Breaks", (assert) => {
Expand All @@ -85,10 +87,12 @@ module minerva.controls.textboxview.caret.tests {
upd.invalidateTextMetrics();
upd.tree.layout(new Size(150, 100), upd.assets);

assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 0, 1, 16));
var fheight = minerva.fontHeight.get(textupd.assets.font);

assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 0, 1, fheight));
upd.assets.selectionStart = 17;
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, 16, 1, 16));
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(0, fheight, 1, fheight));
upd.assets.selectionStart = 20;
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(mock.measure("Thi", textupd.assets.font, true), 16, 1, 16));
assert.deepEqual(upd.tree.getCaretRegion(upd.assets), new Rect(mock.measure("Thi", textupd.assets.font, true), fheight, 1, fheight));
});
}