Prevent tab bar from vanishing on Android

* src/androidfns.c (android_change_tab_bar_height): Amend with
code absent when the function was first transcribed.

* src/haikufns.c (haiku_change_tab_bar_height):

* src/nsfns.m (ns_change_tab_bar_height):

* src/pgtkfns.c (pgtk_change_tab_bar_height):

* src/w32fns.c (w32_change_tab_bar_height):

* src/xfns.c (x_change_tab_bar_height): Revise commentary.

diff --git a/src/androidfns.c b/src/androidfns.c
index aeba9d897adc44796455c4345186c8d9663b51a8..31a4924e34ddf1b847c58b705dde1035bf963a9b 100644 (file)
--- a/src/androidfns.c
+++ b/src/androidfns.c
@@ -367,8 +367,16 @@ android_change_tab_bar_height (struct frame *f, int height)
      the tab bar by even 1 pixel, FRAME_TAB_BAR_LINES will be changed,
      leading to the tab bar height being incorrectly set upon the next
      call to android_set_font.  (bug#59285) */
+
   lines = height / unit;
 
+  /* Even so, HEIGHT might be less than unit if the tab bar face is
+     not so tall as the frame's font height; which if true lines will
+     be set to 0 and the tab bar will thus vanish.  */
+
+  if (lines == 0 && height != 0)
+    lines = 1;
+
   /* Make sure we redisplay all windows in this frame.  */
   fset_redisplay (f);
 

diff --git a/src/haikufns.c b/src/haikufns.c
index 8028a73abd16f9453ca7e78f49f79f71a0c29e9b..e6b1f618d5b9a81c2c4829904cacf121fbbc2daa 100644 (file)
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -184,6 +184,11 @@ haiku_change_tab_bar_height (struct frame *f, int height)
      leading to the tab bar height being incorrectly set upon the next
      call to x_set_font.  (bug#59285) */
   int lines = height / unit;
+
+  /* Even so, HEIGHT might be less than unit if the tab bar face is
+     not so tall as the frame's font height; which if true lines will
+     be set to 0 and the tab bar will thus vanish.  */
+
   if (lines == 0 && height != 0)
     lines = 1;
 

diff --git a/src/nsfns.m b/src/nsfns.m
index 038a3fa23ad12e047da246ead40c9a3030ab6757..33c6020ad518be79acfbd5f3a1ce7bb9f7a52cb5 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -641,6 +641,11 @@ ns_change_tab_bar_height (struct frame *f, int height)
      leading to the tab bar height being incorrectly set upon the next
      call to x_set_font.  (bug#59285) */
   int lines = height / unit;
+
+  /* Even so, HEIGHT might be less than unit if the tab bar face is
+     not so tall as the frame's font height; which if true lines will
+     be set to 0 and the tab bar will thus vanish.  */
+
   if (lines == 0 && height != 0)
     lines = 1;
 

diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index c154d37f47f2f49cc055f99e694ea65126575290..13ac61de960f14d99889577efce1d248b1f52c4b 100644 (file)
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -475,6 +475,11 @@ pgtk_change_tab_bar_height (struct frame *f, int height)
      leading to the tab bar height being incorrectly set upon the next
      call to x_set_font.  (bug#59285) */
   int lines = height / unit;
+
+  /* Even so, HEIGHT might be less than unit if the tab bar face is
+     not so tall as the frame's font height; which if true lines will
+     be set to 0 and the tab bar will thus vanish.  */
+
   if (lines == 0 && height != 0)
     lines = 1;
 

diff --git a/src/w32fns.c b/src/w32fns.c
index 07b389df84aca6609f43535eb3bf4eb24000000d..01644eff826ccf8a98c77148b15c3f354e0344ab 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1732,6 +1732,11 @@ w32_change_tab_bar_height (struct frame *f, int height)
      leading to the tab bar height being incorrectly set upon the next
      call to x_set_font.  (bug#59285) */
   int lines = height / unit;
+
+  /* Even so, HEIGHT might be less than unit if the tab bar face is
+     not so tall as the frame's font height; which if true lines will
+     be set to 0 and the tab bar will thus vanish.  */
+
   if (lines == 0 && height != 0)
     lines = 1;
 

diff --git a/src/xfns.c b/src/xfns.c
index 0b1e94af9f0bbbd614247ef516261a84ba82a642..eadf46b44c413ae70a84e826ad961c2479d4bb15 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1792,6 +1792,11 @@ x_change_tab_bar_height (struct frame *f, int height)
      leading to the tab bar height being incorrectly set upon the next
      call to x_set_font.  (bug#59285) */
   int lines = height / unit;
+
+  /* Even so, HEIGHT might be less than unit if the tab bar face is
+     not so tall as the frame's font height; which if true lines will
+     be set to 0 and the tab bar will thus vanish.  */
+
   if (lines == 0 && height != 0)
     lines = 1;