From ae378ddc25e3cf5d77bf53a7a71b1e26029fa118 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Thu, 18 Feb 2010 19:06:12 +0000 Subject: [PATCH] fix scaling git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@382 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/36fe3d571eb98a55b4169aba46673aba7cda9e95 Author: gixxpunk Date: 2010-02-18 (Thu, 18 Feb 2010) Origin message was: ------------------ - fix scaling git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@382 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/widget/colorchooser.cpp | 4 ++-- src/gui/widget/vfdcontroler.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index f79d160b9..26dba37ae 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -86,8 +86,8 @@ CColorChooser::CColorChooser(const neutrino_locale_t Name, unsigned char *R, uns } } - width = w_max((offset + 290), 0); //fixme: get rid of hardcoded 290 - height = h_max(hheight+ mheight* 4, 0); + width = w_max((offset + (162 + mheight*4 + 10)), 0); + height = h_max(hheight+ mheight* 4, 0); x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth()-width) >> 1); y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1); diff --git a/src/gui/widget/vfdcontroler.cpp b/src/gui/widget/vfdcontroler.cpp index 74b31049d..1510c8f3a 100644 --- a/src/gui/widget/vfdcontroler.cpp +++ b/src/gui/widget/vfdcontroler.cpp @@ -69,7 +69,7 @@ CVfdControler::CVfdControler(const neutrino_locale_t Name, CChangeObserver* Obse lwidth = tmpwidth; } - width = w_max((210 + lwidth), 0); // fixme: get rid of hardcoded 210 (slider + slidertext) + width = w_max((lwidth + 15 + 120 + 10 + 50 + 15), 0); height = h_max(hheight+ mheight* 3+ +mheight/2, 0); x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth()-width) >> 1); y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1);