From bf7ded963c672f858c3b4c14d2cd8278b0d781c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 1 Nov 2014 21:06:49 +0100 Subject: [PATCH] Clean up merge conflict. * macfont.m (macfont_draw): * nsterm.m (ns_mouse_position, judge): Clean up merge conflict. --- src/ChangeLog | 3 +++ src/macfont.m | 2 +- src/nsterm.m | 42 ++---------------------------------------- 3 files changed, 6 insertions(+), 41 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4fb50118444..e79bcb7080a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2014-11-01 Jan Djärv + * macfont.m (macfont_draw): + * nsterm.m (ns_mouse_position, judge): Clean up merge conflict. + * macfont.m (macfont_glyph_extents): Turn off synthetic bold if force_integral_p (i.e. no antialias). (macfont_draw): Check ns_antialias_text, also turn off synthetic diff --git a/src/macfont.m b/src/macfont.m index c29ecc03f23..70548390583 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -2756,7 +2756,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y, atfm = synthetic_italic_atfm; else atfm = CGAffineTransformIdentity; - if (macfont_info->synthetic_bold_p && ! no_antialias_p)) + if (macfont_info->synthetic_bold_p && ! no_antialias_p) { CGContextSetTextDrawingMode (context, kCGTextFillStroke); CGContextSetLineWidth (context, synthetic_bold_factor * font_size); diff --git a/src/nsterm.m b/src/nsterm.m index c814e63f12e..23a5918fac8 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1916,48 +1916,13 @@ ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, /*fprintf (stderr, "ns_mouse_position: %.0f, %.0f\n", position.x, position.y); */ if (bar_window) *bar_window = Qnil; - if (part) *part = 0; /*scroll_bar_handle; */ + if (part) *part = scroll_bar_above_handle; if (x) XSETINT (*x, lrint (position.x)); if (y) XSETINT (*y, lrint (position.y)); if (time) *time = dpyinfo->last_mouse_movement_time; - dpyinfo->last_mouse_scroll_bar = nil; - } - else - { - /* Clear the mouse-moved flag for every frame on this display. */ - FOR_EACH_FRAME (tail, frame) - if (FRAME_NS_P (XFRAME (frame)) - && FRAME_NS_DISPLAY (XFRAME (frame)) == FRAME_NS_DISPLAY (*fp)) - XFRAME (frame)->mouse_moved = 0; - - dpyinfo->last_mouse_scroll_bar = nil; - if (dpyinfo->last_mouse_frame - && FRAME_LIVE_P (dpyinfo->last_mouse_frame)) - f = dpyinfo->last_mouse_frame; - else - f = dpyinfo->x_focus_frame ? dpyinfo->x_focus_frame - : SELECTED_FRAME (); - - if (f && FRAME_NS_P (f)) - { - view = FRAME_NS_VIEW (*fp); - - position = [[view window] mouseLocationOutsideOfEventStream]; - position = [view convertPoint: position fromView: nil]; - remember_mouse_glyph (f, position.x, position.y, - &dpyinfo->last_mouse_glyph); - - if (bar_window) *bar_window = Qnil; - if (part) *part = scroll_bar_above_handle; - - if (x) XSETINT (*x, lrint (position.x)); - if (y) XSETINT (*y, lrint (position.y)); - if (time) - *time = dpyinfo->last_mouse_movement_time; - *fp = f; - } + *fp = f; } unblock_input (); @@ -7254,9 +7219,6 @@ if (cols > 0 && rows > 0) view = (EmacsView *)FRAME_NS_VIEW (frame); if (view != nil) view->scrollbarsNeedingUpdate++; - if (!NILP (win)) - wset_vertical_scroll_bar (XWINDOW (win), Qnil); - win = Qnil; [self removeFromSuperview]; [self release]; unblock_input (); -- 2.39.5