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

Merge branch 'master' into pu/msgbox

Browse Source
This commit is contained in:
Thilo Graf
2016-11-12 22:31:11 +01:00
parent 5443cc274c a47a5cd422
commit 5394f4b2e1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/components/cc_item_picture.cpp
View File

@@ -217,17 +217,21 @@ void CComponentsPicture::initCCItem()
* by setters setWidth/setHeight * by setters setWidth/setHeight
* these steps are required to assign the current image dimensions to item dimensions * these steps are required to assign the current image dimensions to item dimensions
*/ */
if (keep_dx_aspect && dy){ if (keep_dx_aspect && dy)
{
float h_ratio = float(height)*100/(float)dy; float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100); width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_APOLLO
if (do_scale && (width > 10 || height > 10)) if (do_scale && (width > 10 || height > 10))
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif #endif
keep_dx_aspect = false;
} }
if (keep_dy_aspect && dx){ if (keep_dy_aspect && dx)
{
float w_ratio = float(width)*100/(float)dx; float w_ratio = float(width)*100/(float)dx;
height = int(w_ratio*(float)dy/100); height = int(w_ratio*(float)dy/100);
keep_dy_aspect = false;
} }
//resize image and apply current assigned scale values //resize image and apply current assigned scale values

4
src/gui/moviebrowser/mb.cpp
View File

@@ -1402,6 +1402,8 @@ TRACE("[mb]->%s:%d m_movieCover->getHeight(): %d\n", __func__, __LINE__, m_movie
m_movieCover->setWidth(0); // force recalculation m_movieCover->setWidth(0); // force recalculation
TRACE("[mb]->%s:%d m_movieCover->getWidth(): %d\n", __func__, __LINE__, m_movieCover->getWidth()); TRACE("[mb]->%s:%d m_movieCover->getWidth(): %d\n", __func__, __LINE__, m_movieCover->getWidth());
m_movieCover->setHeight(cover_h, true); m_movieCover->setHeight(cover_h, true);
if (m_movieCover->getWidth() > movieCoverBox.iWidth/3)
m_movieCover->setWidth(movieCoverBox.iWidth/3, true); // use maximal one third of box width
m_movieCover->setXPos(movieCoverBox.iX + movieCoverBox.iWidth - m_movieCover->getWidth() - 2*OFFSET_INNER_MID - OFFSET_SHADOW); m_movieCover->setXPos(movieCoverBox.iX + movieCoverBox.iWidth - m_movieCover->getWidth() - 2*OFFSET_INNER_MID - OFFSET_SHADOW);
m_movieCover->setYPos(movieCoverBox.iY + (movieCoverBox.iHeight - m_movieCover->getHeight())/2); m_movieCover->setYPos(movieCoverBox.iY + (movieCoverBox.iHeight - m_movieCover->getHeight())/2);
@@ -3726,6 +3728,8 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
} }
break; break;
case MB_INFO_SPACER: // = 21, case MB_INFO_SPACER: // = 21,
*item_string="";
break;
case MB_INFO_MAX_NUMBER: // = 22 case MB_INFO_MAX_NUMBER: // = 22
default: default:
*item_string=""; *item_string="";