mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-04 11:40:22 +00:00
* nsterm.m (ns_draw_window_cursor): Adjust y for hbar cursor only if smaller than
line height (Bug#17977). Fixes: debbugs:18345
This commit is contained in:
parent
08f27aa39c
commit
6e604a82a0
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user