summaryrefslogtreecommitdiff
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorAlan Third <alan@idiocy.org>2016-05-04 22:22:09 +0100
committerAlan Third <alan@idiocy.org>2016-06-27 23:07:37 +0100
commitcfb3c61f1ffec9a6322407fdd228d5cc31c31ed0 (patch)
tree0b213667fa946a9deca670646fc486cdac776133 /src/nsterm.m
parent1f5592572887fe15e5b660bc60e66a7ab7c624cd (diff)
downloademacs-cfb3c61f1ffec9a6322407fdd228d5cc31c31ed0.tar.gz
Enable dividers in NS (bug#22973)
src/nsfns.m: Add colour settings functions to ns_frame_park_handlers. src/nsterm.m (ns_draw_window_divider): ns_focus has to go before the attempt to set the colour. src/nsterm.m (ns_draw_vertical_window_border): This had the same bug as above, although I didn't see any errors.
Diffstat (limited to 'src/nsterm.m')
-rw-r--r--src/nsterm.m10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index eba75f1b93f..4b887ec0b50 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2955,10 +2955,11 @@ ns_draw_vertical_window_border (struct window *w, int x, int y0, int y1)
NSTRACE ("ns_draw_vertical_window_border");
face = FACE_OPT_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
- if (face)
- [ns_lookup_indexed_color(face->foreground, f) set];
ns_focus (f, &r, 1);
+ if (face)
+ [ns_lookup_indexed_color(face->foreground, f) set];
+
NSRectFill(r);
ns_unfocus (f);
}
@@ -2977,10 +2978,11 @@ ns_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1)
NSTRACE ("ns_draw_window_divider");
face = FACE_OPT_FROM_ID (f, WINDOW_DIVIDER_FACE_ID);
- if (face)
- [ns_lookup_indexed_color(face->foreground, f) set];
ns_focus (f, &r, 1);
+ if (face)
+ [ns_lookup_indexed_color(face->foreground, f) set];
+
NSRectFill(r);
ns_unfocus (f);
}