diff options
| author | Alan Third <alan@idiocy.org> | 2020-01-07 14:19:01 +0000 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2020-01-07 18:33:14 +0000 |
| commit | 72f54f035dc74a01c1ab5ff444752a994d852490 (patch) | |
| tree | fc80598e1e93bc19d22110c1400bdf49cc8ff29a /src/nsfns.m | |
| parent | dd85664d23e29363fe08f8cbbf2b96472ac60fc1 (diff) | |
| download | emacs-72f54f035dc74a01c1ab5ff444752a994d852490.tar.gz emacs-72f54f035dc74a01c1ab5ff444752a994d852490.tar.bz2 emacs-72f54f035dc74a01c1ab5ff444752a994d852490.zip | |
Fix NS frame parameters (bug#39000)
* src/frame.c (make_frame): Use new system default setting.
* src/frame.h (enum ns_appearance_type): Add new system default
setting.
* src/nsfns.m (Fx_create_frame): Correctly handle Qunbound and support
system default appearance.
(syms_of_nsfns): Add Qlight.
* src/nsterm.h: New method definition.
* src/nsterm.m (ns_set_appearance): Correctly handle Qlight and use new
setAppearance method.
([EmacsView initFrameFromEmacs:]): Use new setAppearance method.
([EmacsWindow setAppearance]): New method.
* doc/lispref/frames.texi (Management Parameters): Document 'light'.
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 4d47a90a720..f2857c022ee 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1277,14 +1277,20 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, #ifdef NS_IMPL_COCOA tem = gui_display_get_arg (dpyinfo, parms, Qns_appearance, NULL, NULL, RES_TYPE_SYMBOL); - FRAME_NS_APPEARANCE (f) = EQ (tem, Qdark) - ? ns_appearance_vibrant_dark : ns_appearance_aqua; - store_frame_param (f, Qns_appearance, tem); + if (EQ (tem, Qdark)) + FRAME_NS_APPEARANCE (f) = ns_appearance_vibrant_dark; + else if (EQ (tem, Qlight)) + FRAME_NS_APPEARANCE (f) = ns_appearance_aqua; + else + FRAME_NS_APPEARANCE (f) = ns_appearance_system_default; + store_frame_param (f, Qns_appearance, + (!NILP (tem) && !EQ (tem, Qunbound)) ? tem : Qnil); tem = gui_display_get_arg (dpyinfo, parms, Qns_transparent_titlebar, NULL, NULL, RES_TYPE_BOOLEAN); FRAME_NS_TRANSPARENT_TITLEBAR (f) = !NILP (tem) && !EQ (tem, Qunbound); - store_frame_param (f, Qns_transparent_titlebar, tem); + store_frame_param (f, Qns_transparent_titlebar, + FRAME_NS_TRANSPARENT_TITLEBAR (f) ? Qt : Qnil); #endif parent_frame = gui_display_get_arg (dpyinfo, parms, Qparent_frame, NULL, NULL, @@ -3141,6 +3147,7 @@ syms_of_nsfns (void) DEFSYM (Qframe_title_format, "frame-title-format"); DEFSYM (Qicon_title_format, "icon-title-format"); DEFSYM (Qdark, "dark"); + DEFSYM (Qlight, "light"); DEFVAR_LISP ("ns-icon-type-alist", Vns_icon_type_alist, doc: /* Alist of elements (REGEXP . IMAGE) for images of icons associated to frames. |