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

port getScreenStartX() & getScreenStartY() code from tuxbox CVS; use getScreenStartX(),getScreenStartY(),h_max(),w_max() routines

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e9d4bc46a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2009-12-17 (Thu, 17 Dec 2009)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2009-12-17 11:19:16 +00:00
parent 0f1dd517c9
commit 2d92e59f67
2 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.cpp
View File

@@ -130,7 +130,7 @@ void CEpgData::start()
{ {
ox = w_max (MAX_W * (bigFonts ? BIG_FONT_FAKTOR : 1), 0); ox = w_max (MAX_W * (bigFonts ? BIG_FONT_FAKTOR : 1), 0);
oy = h_max (MAX_H * (bigFonts ? BIG_FONT_FAKTOR : 1), 0); oy = h_max (MAX_H * (bigFonts ? BIG_FONT_FAKTOR : 1), 0);
sx = (((g_settings.screen_EndX-g_settings.screen_StartX) -ox) / 2) + g_settings.screen_StartX; sx = getScreenStartX( ox );
topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight(); topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight();
topboxheight = topheight + 6; topboxheight = topheight + 6;

6
src/gui/upnpbrowser.cpp
View File

@@ -49,6 +49,7 @@
#include <driver/audioplay.h> #include <driver/audioplay.h>
#include <driver/audiofile.h> #include <driver/audiofile.h>
#include <driver/audiometadata.h> #include <driver/audiometadata.h>
#include <driver/screen_max.h>
#include <daemonc/remotecontrol.h> #include <daemonc/remotecontrol.h>
@@ -139,9 +140,8 @@ int CUpnpBrowserGui::exec(CMenuTarget* parent, const std::string & /*actionKey*/
m_listmaxshow = (m_height - m_info_height - m_title_height - m_theight - 2*m_buttonHeight) / (m_fheight); m_listmaxshow = (m_height - m_info_height - m_title_height - m_theight - 2*m_buttonHeight) / (m_fheight);
m_height = m_theight + m_info_height + m_title_height + 2*m_buttonHeight + m_listmaxshow * m_fheight; // recalc height m_height = m_theight + m_info_height + m_title_height + 2*m_buttonHeight + m_listmaxshow * m_fheight; // recalc height
m_x = (((g_settings.screen_EndX - g_settings.screen_StartX) - (m_width + ConnectLineBox_Width)) / 2) m_x=getScreenStartX( m_width + ConnectLineBox_Width ) + ConnectLineBox_Width;
+ g_settings.screen_StartX + ConnectLineBox_Width; m_y=getScreenStartY( m_height );
m_y = (((g_settings.screen_EndY- g_settings.screen_StartY) - m_height)/ 2) + g_settings.screen_StartY;
// Stop sectionsd // Stop sectionsd
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);