aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Third2016-05-04 22:22:09 +0100
committerAlan Third2016-06-27 23:07:37 +0100
commitcfb3c61f1ffec9a6322407fdd228d5cc31c31ed0 (patch)
tree0b213667fa946a9deca670646fc486cdac776133
parent1f5592572887fe15e5b660bc60e66a7ab7c624cd (diff)
downloademacs-cfb3c61f1ffec9a6322407fdd228d5cc31c31ed0.tar.gz
emacs-cfb3c61f1ffec9a6322407fdd228d5cc31c31ed0.zip
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.
-rw-r--r--src/nsfns.m4
-rw-r--r--src/nsterm.m10
2 files changed, 8 insertions, 6 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 820254fa37d..051e5091919 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -983,8 +983,8 @@ frame_parm_handler ns_frame_parm_handlers[] =
983 x_set_icon_name, 983 x_set_icon_name,
984 x_set_icon_type, 984 x_set_icon_type,
985 x_set_internal_border_width, /* generic OK */ 985 x_set_internal_border_width, /* generic OK */
986 0, /* x_set_right_divider_width */ 986 x_set_right_divider_width,
987 0, /* x_set_bottom_divider_width */ 987 x_set_bottom_divider_width,
988 x_set_menu_bar_lines, 988 x_set_menu_bar_lines,
989 x_set_mouse_color, 989 x_set_mouse_color,
990 x_explicitly_set_name, 990 x_explicitly_set_name,
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)
2955 NSTRACE ("ns_draw_vertical_window_border"); 2955 NSTRACE ("ns_draw_vertical_window_border");
2956 2956
2957 face = FACE_OPT_FROM_ID (f, VERTICAL_BORDER_FACE_ID); 2957 face = FACE_OPT_FROM_ID (f, VERTICAL_BORDER_FACE_ID);
2958 if (face)
2959 [ns_lookup_indexed_color(face->foreground, f) set];
2960 2958
2961 ns_focus (f, &r, 1); 2959 ns_focus (f, &r, 1);
2960 if (face)
2961 [ns_lookup_indexed_color(face->foreground, f) set];
2962
2962 NSRectFill(r); 2963 NSRectFill(r);
2963 ns_unfocus (f); 2964 ns_unfocus (f);
2964} 2965}
@@ -2977,10 +2978,11 @@ ns_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1)
2977 NSTRACE ("ns_draw_window_divider"); 2978 NSTRACE ("ns_draw_window_divider");
2978 2979
2979 face = FACE_OPT_FROM_ID (f, WINDOW_DIVIDER_FACE_ID); 2980 face = FACE_OPT_FROM_ID (f, WINDOW_DIVIDER_FACE_ID);
2980 if (face)
2981 [ns_lookup_indexed_color(face->foreground, f) set];
2982 2981
2983 ns_focus (f, &r, 1); 2982 ns_focus (f, &r, 1);
2983 if (face)
2984 [ns_lookup_indexed_color(face->foreground, f) set];
2985
2984 NSRectFill(r); 2986 NSRectFill(r);
2985 ns_unfocus (f); 2987 ns_unfocus (f);
2986} 2988}