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);