From a76d358dfe7aeabc0647ddf0e3ea1dc9a2ebedd0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 14 Oct 2017 08:40:11 +0200 Subject: [PATCH] cc-footer: remove our calcation of label-width; should now work automatically Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8aad36ed83c062951df7024f72104351554b3b22 Author: vanhofen Date: 2017-10-14 (Sat, 14 Oct 2017) Origin message was: ------------------ - cc-footer: remove our calcation of label-width; should now work automatically ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_footer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp index 3f42d0b71..00cdf49df 100644 --- a/src/gui/components/cc_frm_footer.cpp +++ b/src/gui/components/cc_frm_footer.cpp @@ -375,14 +375,10 @@ void CComponentsFooter::paintButtons(const int& x_pos, Font* font, bool do_save_bg) { - int lw = label_width; - if (label_count > 0 && label_width == 0) - lw = (w/label_count) - 2*cch_offset; - this->setDimensionsAll(x_pos, y_pos, w, h); this->setButtonFont(font); this->setContextButton(context_buttons); - this->setButtonLabels(content, label_count, 0, lw); + this->setButtonLabels(content, label_count, 0, label_width); this->paint(do_save_bg); }