From dca2980e303c758117da3791c94c76c02c977747 Mon Sep 17 00:00:00 2001 From: satbaby Date: Wed, 24 Feb 2010 09:32:21 +0000 Subject: [PATCH] fix clock position & corner git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@403 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/infoclock.cpp | 10 +++------- src/gui/infoclock.h | 2 +- src/gui/timeosd.cpp | 8 ++++---- src/neutrino.cpp | 13 +++++++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/gui/infoclock.cpp b/src/gui/infoclock.cpp index 2b445fdcd..d90e4a5f9 100644 --- a/src/gui/infoclock.cpp +++ b/src/gui/infoclock.cpp @@ -12,12 +12,13 @@ #include #include "infoclock.h" -#define XOFF 10 #define YOFF 0 CInfoClock::CInfoClock() { frameBuffer = CFrameBuffer::getInstance(); + x = frameBuffer->getScreenWidth(); + y = frameBuffer->getScreenY(); time_height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getHeight(); int t1 = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(widest_number); @@ -35,9 +36,6 @@ CInfoClock::~CInfoClock() void CInfoClock::paintTime( bool show_dot) { - int x = g_settings.screen_EndX - XOFF; - int y = g_settings.screen_StartY + YOFF; - char timestr[10]; time_t tm; @@ -46,7 +44,7 @@ void CInfoClock::paintTime( bool show_dot) strftime((char*) ×tr, 20, "%H:%M:%S", localtime(&tm)); else strftime((char*) ×tr, 20, "%H.%M:%S", localtime(&tm)); - frameBuffer->paintBoxRel(x - time_width - 15, y, time_width, time_height, COL_MENUCONTENT_PLUS_0, 7); + frameBuffer->paintBoxRel(x - time_width - 15, y, time_width, time_height, COL_MENUCONTENT_PLUS_0, RADIUS_SMALL); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(x - time_width- 10, y+ time_height, time_width, timestr, COL_MENUCONTENT); } @@ -78,8 +76,6 @@ void CInfoClock::StartClock() void CInfoClock::StopClock() { - int x = g_settings.screen_EndX - XOFF; - int y = g_settings.screen_StartY + YOFF; if(thrTimer) { pthread_cancel(thrTimer); thrTimer = 0; diff --git a/src/gui/infoclock.h b/src/gui/infoclock.h index 68fca718e..3f7541985 100644 --- a/src/gui/infoclock.h +++ b/src/gui/infoclock.h @@ -20,7 +20,7 @@ class CInfoClock int time_width; int time_height; void paintTime( bool show_dot); - + int y,x; static void CleanUpProc(void* arg); static void* TimerProc(void *arg); diff --git a/src/gui/timeosd.cpp b/src/gui/timeosd.cpp index 92cfb78d2..0a7d84388 100644 --- a/src/gui/timeosd.cpp +++ b/src/gui/timeosd.cpp @@ -69,9 +69,9 @@ void CTimeOSD::show(time_t time_show) void CTimeOSD::GetDimensions() { m_xstart = g_settings.screen_StartX + 10; - m_xend = g_settings.screen_EndX - 10; + m_xend = frameBuffer->getScreenWidth(); m_height = g_Font[TIMEOSD_FONT]->getHeight(); - m_y = g_settings.screen_StartY + 10; + m_y = frameBuffer->getScreenY(); m_width = g_Font[TIMEOSD_FONT]->getRenderWidth("00:00:00"); if(g_settings.mode_clock) { int x1 = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(widest_number); @@ -127,11 +127,11 @@ void CTimeOSD::updatePos(short runningPercent) void CTimeOSD::hide() { GetDimensions(); -printf("CTimeOSD::hide: x %d y %d xend %d yend %d\n", m_xstart, m_y , m_xend - (g_settings.mode_clock ? 35 : 0), m_height + 15); +printf("CTimeOSD::hide: x %d y %d xend %d yend %d\n", m_xstart, m_y , m_xend - (g_settings.mode_clock ? m_width-5 : 0), m_height + 15); if(!visible) return; //frameBuffer->paintBackgroundBoxRel(m_xstart-10, m_y - 10 , m_xend - (g_settings.mode_clock ? 35 : 0), m_height + 15); - frameBuffer->paintBackgroundBoxRel(m_xstart-2, m_y , m_xend - (g_settings.mode_clock ? 35 : 0), m_height + 15); + frameBuffer->paintBackgroundBoxRel(m_xstart-2, m_y , m_xend - (g_settings.mode_clock ? m_width-5 : 0), m_height + 15); visible=false; timescale->reset(); } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 8ac53f8b5..1d3c853cc 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3714,11 +3714,16 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy); int vol = g_settings.current_volume; int sw = frameBuffer->getScreenWidth(); int sh = frameBuffer->getScreenHeight(); + int clock_height = 0; switch( g_settings.volume_pos ) { case 0:// upper right + if(g_settings.mode_clock){ + clock_height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getHeight(); + } x = sw - dx; + y += clock_height; break; case 1:// upper left break; @@ -3745,10 +3750,10 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy); if(pixbuf!= NULL) frameBuffer->SaveScreen(x, y, dx, dy, pixbuf); - frameBuffer->paintBoxRel(x , y , dx, dy, COL_INFOBAR_SHADOW_PLUS_1, g_settings.rounded_corners ? dy/2 : 0); - frameBuffer->paintBoxRel (x + dy + (dy/4)-2, y+(dy/4)-2, ((dy/2)*12.5) +4, dy/2+4, COL_INFOBAR_PLUS_3); - frameBuffer->paintBoxRel (x + dy + (dy/4), y+(dy/4), (dy/2)*12.5, dy/2, COL_INFOBAR_PLUS_0); - frameBuffer->paintIcon(NEUTRINO_ICON_VOLUME,x+dy/2,y+(dy/4), 0, COL_INFOBAR); + frameBuffer->paintBoxRel(x , y , dx, dy, COL_MENUCONTENT_PLUS_0, g_settings.rounded_corners ? dy/2 : 0); + frameBuffer->paintBoxRel (x + dy + (dy/4)-2, y+(dy/4)-2, ((dy/2)*12.5) +4, dy/2+4, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel (x + dy + (dy/4), y+(dy/4), (dy/2)*12.5, dy/2, COL_MENUCONTENT_PLUS_1); + frameBuffer->paintIcon(NEUTRINO_ICON_VOLUME,x+dy/2,y+(dy/4), 0, COL_MENUCONTENT_PLUS_0); g_volscale->reset(); g_volscale->paintProgressBar2(x + dy+ (dy/4), y +(dy/4), g_settings.current_volume);