From 61700d8d8c07fafbc70934292cfc20b4620b1e12 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 18 Nov 2021 22:09:09 +0100 Subject: [PATCH] Revert "- bouquetlist: ugly workaround for better readability" This reverts commit b53ef18825e26413ff27a5043536a6ddc8420fbc. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4db9d2338089e2944164407ad26cf60329fb5acb Author: vanhofen Date: 2021-11-18 (Thu, 18 Nov 2021) ------------------ This commit was generated by Migit --- src/gui/bouquetlist.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index a32b1f27e..3486f1609 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -425,8 +425,7 @@ int CBouquetList::show(bool bShowChannelList) It would be better to get the needed width from CComponententsFooter class. */ - int numButtons = (sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0])); - width = numButtons*(w_max_icon + w_max_text + numButtons*OFFSET_INNER_MID); + width = (sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]))*(w_max_icon + w_max_text + 2*OFFSET_INNER_MID); height = 16*item_height; header_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();