From 52a9af6f720f3ac1fabcfbbc16ebbe16516bc09c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 7 Feb 2010 12:44:46 +0000 Subject: [PATCH] neutrino: consider menu icon width for calculation of iconOffset git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@289 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/fd348f036a44115b80b774bb650ed63c0618c526 Author: Stefan Seyfried Date: 2010-02-07 (Sun, 07 Feb 2010) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 36bcc30b8..ee5abc530 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -482,10 +482,14 @@ void CMenuWidget::paint() for (unsigned int i= 0; i< items.size(); i++) { if ((!(items[i]->iconName.empty())) || CRCInput::isNumeric(items[i]->directKey)) { - iconOffset = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); + int w, h; + frameBuffer->getIconSize(items[i]->iconName.c_str(), &w, &h); + if (w > iconOffset) + iconOffset = w; break; } } + iconOffset += 10; width += iconOffset; if (width > (int)frameBuffer->getScreenWidth()) width = frameBuffer->getScreenWidth();