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.

diff --git a/src/nsfns.m b/src/nsfns.m
index 820254fa37df8aa4f4e114e5059ba7eedde69159..051e5091919ff1686e09c25482b0c6177d6a286a 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -983,8 +983,8 @@ frame_parm_handler ns_frame_parm_handlers[] =
   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 eba75f1b93f942dd50b746d16029d84c0bd350cc..4b887ec0b50abf231b32e36f80e668a10ad5a873 100644 (file)
--- 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);
 }