From 106dcb7d174890a98ff0080f75cd1da0f6d437a1 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 26 Mar 2013 01:14:39 +0100 Subject: [PATCH] epgplus.cpp: use getScreen{Width/Height}Rel() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f7ebed39cb07ca87b531bbebd59fb9aa7179ac60 Author: vanhofen Date: 2013-03-26 (Tue, 26 Mar 2013) Origin message was: ------------------ - epgplus.cpp: use getScreen{Width/Height}Rel() ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 0aed608ff..030ef4be6 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -647,8 +647,8 @@ void EpgPlus::init() currentViewMode = ViewMode_Scroll; currentSwapMode = SwapMode_ByPage; #endif - usableScreenWidth = w_max (g_settings.screen_EndX, 0); - usableScreenHeight = h_max (g_settings.screen_EndY, 0); + usableScreenWidth = frameBuffer->getScreenWidthRel(); + usableScreenHeight = frameBuffer->getScreenHeightRel(); std::string FileName = std::string (g_settings.font_file); for (size_t i = 0; i < NumberOfFontSettings; ++i) { int size = fontSettingTable[i].size; @@ -703,8 +703,8 @@ void EpgPlus::init() this->maxNumberOfDisplayableEntries = (this->usableScreenHeight - headerHeight - timeLineHeight - horGap1Height - horGap2Height - footerHeight) / this->entryHeight; this->usableScreenHeight = headerHeight + timeLineHeight + horGap1Height + this->maxNumberOfDisplayableEntries * this->entryHeight + horGap2Height + footerHeight; // recalc deltaY - this->usableScreenX = (((g_settings.screen_EndX - g_settings.screen_StartX) - this->usableScreenWidth) / 2) + g_settings.screen_StartX; - this->usableScreenY = (((g_settings.screen_EndY - g_settings.screen_StartY) - this->usableScreenHeight) / 2) + g_settings.screen_StartY; + this->usableScreenX = getScreenStartX(this->usableScreenWidth); + this->usableScreenY = getScreenStartY(this->usableScreenHeight); this->headerX = this->usableScreenX; this->headerY = this->usableScreenY;