Fix :color specification in flat-button boxes

* src/xfaces.c (realize_gui_face): Allow reliably specifying
:color in flat-button boxes (bug#54196).

diff --git a/src/xfaces.c b/src/xfaces.c
index 55a9bed8f22833cff2f909fc092445e14810e8e0..8100bdb1570c30d7b5e039819c17e67246d42d04 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5978,6 +5978,8 @@ realize_gui_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE]
     }
   else if (CONSP (box))
     {
+      bool set_color = false;
+
       /* `(:width WIDTH :color COLOR :shadow SHADOW)'.  SHADOW
         being one of `raised' or `sunken'.  */
       face->box = FACE_SIMPLE_BOX;
@@ -6015,6 +6017,7 @@ realize_gui_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE]
                  face->box_color = load_color (f, face, value,
                                                LFACE_BOX_INDEX);
                  face->use_box_color_for_shadows_p = true;
+                 set_color = true;
                }
            }
          else if (EQ (keyword, QCstyle))
@@ -6026,7 +6029,9 @@ realize_gui_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE]
              else if (EQ (value, Qflat_button))
                {
                  face->box = FACE_SIMPLE_BOX;
-                 face->box_color = face->background;
+                 /* Don't override colors set in this box. */
+                 if (!set_color)
+                   face->box_color = face->background;
                }
            }
        }