Fix calculation of tool bar width reported by `frame-geometry' (Bug#24107)