From: Po Lu <luangruo@yahoo.com>
Date: Sat, 22 Jul 2023 00:32:59 +0000 (+0800)
Subject: Fix default value of scroll bar frame parameters on Android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d73b18c589394b6c3545cf73b015e7bc09575e5;p=emacs.git

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.
---

diff --git a/src/androidfns.c b/src/androidfns.c
index 11ed2e6c00a..dcc9ab83427 100644
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -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),
                          NULL, NULL, RES_TYPE_NUMBER);
 
-  gui_default_parameter (f, parms, Qvertical_scroll_bars,
-                         Qleft,
+  /* `vertical-scroll-bars' defaults to nil on Android as a
+     consequence of scroll bars not being supported at all.  */
+
+  gui_default_parameter (f, parms, Qvertical_scroll_bars, Qnil,
                          "verticalScrollBars", "ScrollBars",
                          RES_TYPE_SYMBOL);
   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);
   /* Scroll bars are not supported on Android, as they are near
      useless.  */
-#if 0
   gui_default_parameter (f, parms, Qscroll_bar_width, Qnil,
                          "scrollBarWidth", "ScrollBarWidth",
                          RES_TYPE_NUMBER);
   gui_default_parameter (f, parms, Qscroll_bar_height, Qnil,
                          "scrollBarHeight", "ScrollBarHeight",
                          RES_TYPE_NUMBER);
-#endif
   gui_default_parameter (f, parms, Qalpha, Qnil,
                          "alpha", "Alpha", RES_TYPE_NUMBER);
   gui_default_parameter (f, parms, Qalpha_background, Qnil,