mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert accidental part of rev 142

Browse Source 
Accidentally, the epgview window size was changed by rev 142 (and
again by satbaby's rev 145), but this part needs more work.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@146 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: d41c11fa47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-04 (Mon, 04 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-01-04 08:07:10 +00:00
parent 8191a4f8d4
commit 2188a35031
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/epgview.cpp
View File

@@ -127,14 +127,8 @@ CEpgData::CEpgData()
void CEpgData::start() void CEpgData::start()
{ {
/* This defines the size of the EPG window. We leave 35 pixels left and right, ox = w_max (MAX_W * (bigFonts ? BIG_FONT_FAKTOR : 1), 0);
* 25 pixels top and bottom. It adjusts itself to the "visible screen" settings oy = h_max (MAX_H * (bigFonts ? BIG_FONT_FAKTOR : 1), 0);
*/
// ox = w_max (1280, 70);
// oy = h_max (720, 50 + 30); // 30 for the bottom button box.
ox = w_max ((bigFonts ? g_settings.screen_EndX : MAX_W), 70);
oy = h_max ((bigFonts ? g_settings.screen_EndY : MAX_H), 50 + 30 );// 30 for the bottom button box.
sx = getScreenStartX( ox ); sx = getScreenStartX( ox );
topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight(); topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight();
@@ -151,7 +145,6 @@ void CEpgData::start()
oy = botboxheight+medlinecount*medlineheight; // recalculate //FIXME oy = botboxheight+medlinecount*medlineheight; // recalculate //FIXME
sy = getScreenStartY(oy- topboxheight); sy = getScreenStartY(oy- topboxheight);
toph = topboxheight; toph = topboxheight;
fprintf(stderr, "CEpgData::start ox: %d oy: %d sx: %d sy: %d xmax: %d ymax: %d\n", ox, oy, sy, sy, w_max(9999,0), h_max(9999,0));
} }
void CEpgData::addTextToArray(const std::string & text) // UTF-8 void CEpgData::addTextToArray(const std::string & text) // UTF-8