- labeladdon = int(
- (lyxfont::maxAscent(labelfont) *
- layout.spacing.getValue() *
- bparams->spacing.getValue())
- +(lyxfont::maxDescent(labelfont) *
- layout.spacing.getValue() *
- bparams->spacing.getValue())
- + layout.topsep * DefaultHeight()
- + layout.labelbottomsep * DefaultHeight());
+ float spacing_val = 1.0;
+ if (!row_ptr->par->spacing.isDefault()) {
+ spacing_val = row_ptr->par->spacing.getValue();
+ } else {
+ spacing_val = bparams->spacing.getValue();
+ }
+
+ labeladdon = int(
+ (lyxfont::maxAscent(labelfont) *
+ layout.spacing.getValue() *
+ spacing_val)
+ +(lyxfont::maxDescent(labelfont) *
+ layout.spacing.getValue() *
+ spacing_val)
+ + layout.topsep * DefaultHeight()
+ + layout.labelbottomsep * DefaultHeight());