Merge pull request gnachman#79 from DHowett/master

Use lineHeight instead of the character height as the cursor height.
jacaetevha · Apr 25, 2012 · 33274a2 · 33274a2
2 parents 3ea4409 + 269dc54
commit 33274a2
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/PTYTextView.m b/PTYTextView.m
@@ -6758,13 +6758,7 @@ - (BOOL)drawInputMethodEditorTextAt:(int)xStart
 
 - (double)cursorHeight
 {
-    double cursorHeight;
-    if (lineHeight < charHeightWithoutSpacing) {
-        cursorHeight = lineHeight;
-    } else {
-        cursorHeight = charHeightWithoutSpacing;
-    }
-    return cursorHeight;
+    return MAX(lineHeight, charHeightWithoutSpacing);
 }
 
 - (void)_drawCursor