1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Fix default value of scroll bar frame parameters on Android

* src/androidfns.c (Fx_create_frame): Default
Qvertical_scroll_bars to Qnil, but set scroll-bar-width and
scroll-bar-height.
This commit is contained in:
Po Lu 2023-07-22 08:32:59 +08:00
parent 95db5042d5
commit 0d73b18c58

View file

@ -916,8 +916,10 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
gui_default_parameter (f, parms, Qbottom_divider_width, make_fixnum (0), gui_default_parameter (f, parms, Qbottom_divider_width, make_fixnum (0),
NULL, NULL, RES_TYPE_NUMBER); NULL, NULL, RES_TYPE_NUMBER);
gui_default_parameter (f, parms, Qvertical_scroll_bars, /* `vertical-scroll-bars' defaults to nil on Android as a
Qleft, consequence of scroll bars not being supported at all. */
gui_default_parameter (f, parms, Qvertical_scroll_bars, Qnil,
"verticalScrollBars", "ScrollBars", "verticalScrollBars", "ScrollBars",
RES_TYPE_SYMBOL); RES_TYPE_SYMBOL);
gui_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil, gui_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil,
@ -1034,14 +1036,12 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
"cursorType", "CursorType", RES_TYPE_SYMBOL); "cursorType", "CursorType", RES_TYPE_SYMBOL);
/* Scroll bars are not supported on Android, as they are near /* Scroll bars are not supported on Android, as they are near
useless. */ useless. */
#if 0
gui_default_parameter (f, parms, Qscroll_bar_width, Qnil, gui_default_parameter (f, parms, Qscroll_bar_width, Qnil,
"scrollBarWidth", "ScrollBarWidth", "scrollBarWidth", "ScrollBarWidth",
RES_TYPE_NUMBER); RES_TYPE_NUMBER);
gui_default_parameter (f, parms, Qscroll_bar_height, Qnil, gui_default_parameter (f, parms, Qscroll_bar_height, Qnil,
"scrollBarHeight", "ScrollBarHeight", "scrollBarHeight", "ScrollBarHeight",
RES_TYPE_NUMBER); RES_TYPE_NUMBER);
#endif
gui_default_parameter (f, parms, Qalpha, Qnil, gui_default_parameter (f, parms, Qalpha, Qnil,
"alpha", "Alpha", RES_TYPE_NUMBER); "alpha", "Alpha", RES_TYPE_NUMBER);
gui_default_parameter (f, parms, Qalpha_background, Qnil, gui_default_parameter (f, parms, Qalpha_background, Qnil,