From d8a22aa6eecf4bb1c55f2804972d519153986cd9 Mon Sep 17 00:00:00 2001 From: Martin Schirrmacher Date: Fri, 6 Feb 2015 19:27:39 +0100 Subject: [update] widgets: weather text size of temperature in long view --- HISTORY | 1 + displaymenu.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index bd1da693..2414b5f7 100644 --- a/HISTORY +++ b/HISTORY @@ -14,6 +14,7 @@ VDR Plugin 'skinflatplus' Revision History - [update] add 15:11 aspect in displaychannel and replay - [update] disk usage icons with 16 sections instead of 8 - [update] widgets: system_information.g2v, temperatures.g2v, temperatures.default +- [update] widgets: weather text size of temperature in long view 2014-12-04: Version 0.5.0 - [fix] femon receiver - do not get data from previous channel diff --git a/displaymenu.c b/displaymenu.c index 307abffb..6e6ff386 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -4835,7 +4835,7 @@ int cFlatDisplayMenu::DrawMainMenuWidgetWeather(int wLeft, int wWidth, int Conte weekDayName = WeekDayName(t2); if( Config.MainMenuWidgetWeatherType == 0 ) { // short - if( left + fontHeight*2 + fontTempSml->Width("XXXXX") + fontTempSml->Width("XXXX") + marginItem*6 > wWidth ) + if( left + fontHeight*2 + fontTempSml->Width("-99,9°C") + fontTempSml->Width("XXXX") + marginItem*6 > wWidth ) break; if( index > 0 ) { contentWidget.AddText("|", false, cRect(left, ContentTop, 0, 0), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), font); @@ -4877,10 +4877,10 @@ int cFlatDisplayMenu::DrawMainMenuWidgetWeather(int wLeft, int wWidth, int Conte contentWidget.AddImage(img, cRect(left, ContentTop + marginItem, fontHeight, fontHeight)); left += fontHeight + marginItem; } - contentWidget.AddText(tempMax.c_str(), false, cRect(left, ContentTop, 0, 0), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), fontTempSml, fontTempSml->Width("XXXXX"), fontTempSml->Height(), taRight); - contentWidget.AddText(tempMin.c_str(), false, cRect(left, ContentTop + fontTempSml->Height(), 0, 0), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), fontTempSml, fontTempSml->Width("XXXXX"), fontTempSml->Height(), taRight); + contentWidget.AddText(tempMax.c_str(), false, cRect(left, ContentTop, 0, 0), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), fontTempSml, fontTempSml->Width("-99,9°C"), fontTempSml->Height(), taRight); + contentWidget.AddText(tempMin.c_str(), false, cRect(left, ContentTop + fontTempSml->Height(), 0, 0), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), fontTempSml, fontTempSml->Width("-99,9°C"), fontTempSml->Height(), taRight); - left += fontTempSml->Width("XXXXXX") + marginItem; + left += fontTempSml->Width("-99,9°C ") + marginItem; img = imgLoader.LoadIcon("widgets/umbrella", fontHeight, fontHeight - marginItem*2); if( img ) { -- cgit v1.2.3