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.
---
src/nsfns.m | 4 ++--
src/nsterm.m | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/nsfns.m b/src/nsfns.m
index ea09908..9291f8e 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -983,8 +983,8 @@ Turn the input menu (an NSMenu) into a lisp list for
tracking on lisp side
x_set_icon_name,
x_set_icon_type,
x_set_internal_border_width, /* generic OK */
- 0, /* x_set_right_divider_width */
- 0, /* x_set_bottom_divider_width */
+ x_set_right_divider_width,
+ x_set_bottom_divider_width,
x_set_menu_bar_lines,
x_set_mouse_color,
x_explicitly_set_name,
diff --git a/src/nsterm.m b/src/nsterm.m
index 1d48c04..438054f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2951,10 +2951,11 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar
cursors.
NSTRACE ("ns_draw_vertical_window_border");
face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
+
+ ns_focus (f, &r, 1);
if (face)
[ns_lookup_indexed_color(face->foreground, f) set];
- ns_focus (f, &r, 1);
NSRectFill(r);
ns_unfocus (f);
}
@@ -2973,10 +2974,11 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar
cursors.
NSTRACE ("ns_draw_window_divider");
face = FACE_FROM_ID (f, WINDOW_DIVIDER_FACE_ID);
+
+ ns_focus (f, &r, 1);
if (face)
[ns_lookup_indexed_color(face->foreground, f) set];
- ns_focus (f, &r, 1);
NSRectFill(r);
ns_unfocus (f);
}