Commit 6e604a82 authored by Jan Djärv's avatar Jan Djärv
Browse files

* nsterm.m (ns_draw_window_cursor): Adjust y for hbar cursor only if smaller than

line height (Bug#17977).

Fixes: debbugs:18345
parent 08f27aa3
......@@ -4,6 +4,8 @@
(toggleFullScreen:): Use ns-use-fullscreen-animation for animate.
(ns_select, ns_read_socket): Use unwind_protect to decrease
apploopnr (Bug#18345).
(ns_draw_window_cursor): Adjust y for hbar cursor only if smaller than
line height (Bug#17977).
 
* macfont.m: Fix indentation and import changes from macport
24.3.94.
......
......@@ -2441,7 +2441,10 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
else if (cursor_type == HBAR_CURSOR)
{
cursor_height = (cursor_width < 1) ? lrint (0.25 * h) : cursor_width;
fy += h - cursor_height;
if (cursor_height > glyph_row->height)
cursor_height = glyph_row->height;
if (h > cursor_height) // Cursor smaller than line height, move down
fy += h - cursor_height;
h = cursor_height;
}
......@@ -6884,7 +6887,7 @@ -(BOOL)performDragOperation: (id <NSDraggingInfo>) sender
}
else
{
error ("Invalid data type in dragging pasteboard");
fprintf (stderr, "Invalid data type in dragging pasteboard");
return NO;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment