Mercurial > emacs
comparison src/nsterm.m @ 109302:60516122d066
Merge changes from emacs-23 branch.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 10 Jul 2010 14:52:53 -0400 |
parents | 750db9f3e6d8 f6f0d450d542 |
children | 9cfca8c9fb07 |
comparison
equal
deleted
inserted
replaced
109190:8afa85da3f2d | 109302:60516122d066 |
---|---|
2175 nBimgs = max_used_fringe_bitmap; | 2175 nBimgs = max_used_fringe_bitmap; |
2176 } | 2176 } |
2177 | 2177 |
2178 /* Must clip because of partially visible lines. */ | 2178 /* Must clip because of partially visible lines. */ |
2179 rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); | 2179 rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); |
2180 if (p->y < rowY) | 2180 ns_clip_to_row (w, row, -1, YES); |
2181 { | |
2182 /* Adjust position of "bottom aligned" bitmap on partially | |
2183 visible last row. */ | |
2184 int oldY = row->y; | |
2185 int oldVH = row->visible_height; | |
2186 row->visible_height = p->h; | |
2187 row->y -= rowY - p->y; | |
2188 ns_clip_to_row (w, row, -1, NO); | |
2189 row->y = oldY; | |
2190 row->visible_height = oldVH; | |
2191 } | |
2192 else | |
2193 ns_clip_to_row (w, row, -1, YES); | |
2194 | 2181 |
2195 if (p->bx >= 0 && !p->overlay_p) | 2182 if (p->bx >= 0 && !p->overlay_p) |
2196 { | 2183 { |
2197 int yAdjust = rowY - FRAME_INTERNAL_BORDER_WIDTH (f) < 5 ? | 2184 int yAdjust = rowY - FRAME_INTERNAL_BORDER_WIDTH (f) < 5 ? |
2198 -FRAME_INTERNAL_BORDER_WIDTH (f) : 0; | 2185 -FRAME_INTERNAL_BORDER_WIDTH (f) : 0; |