From b3b0c90b2c81b4054aef7df05b1b487632c3e361 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 20:40:28 +0100 Subject: [PATCH 1/3] moviebrowser: fix MB_INFO_SPACER's empty content Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/da604fb9a5b5626b02f38d43b1a9f86a30efc7d8 Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - moviebrowser: fix MB_INFO_SPACER's empty content --- src/gui/moviebrowser/mb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 42d995daf..7cde3f83e 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -3726,6 +3726,8 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite } break; case MB_INFO_SPACER: // = 21, + *item_string=""; + break; case MB_INFO_MAX_NUMBER: // = 22 default: *item_string=""; From 9533a9ba4e9de75c95372336ee4e9551ac358196 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 22:00:12 +0100 Subject: [PATCH 2/3] cc_item_picture: reset keep_aspect variables after use Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/73b97ecd4df690d8283ea706fe4ca4bbc48a0d1f Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - cc_item_picture: reset keep_aspect variables after use --- src/gui/components/cc_item_picture.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index 89ffaed86..ad3ec018b 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -216,17 +216,21 @@ void CComponentsPicture::initCCItem() * by setters setWidth/setHeight * 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; width = int(h_ratio*(float)dx/100); #ifdef BOXMODEL_APOLLO if (do_scale && (width > 10 || height > 10)) width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; #endif + keep_dx_aspect = false; } - if (keep_dy_aspect && dx){ + if (keep_dy_aspect && dx) + { float w_ratio = float(width)*100/(float)dx; height = int(w_ratio*(float)dy/100); + keep_dy_aspect = false; } //resize image and apply current assigned scale values From af321e4411eca276a5d3815e5ae90bad14055544 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 22:03:05 +0100 Subject: [PATCH 3/3] moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a47a5cd422b2df4180aa0b91bdfc34ba6de6e86c Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width --- src/gui/moviebrowser/mb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 7cde3f83e..a021f4ad0 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1402,6 +1402,8 @@ TRACE("[mb]->%s:%d m_movieCover->getHeight(): %d\n", __func__, __LINE__, m_movie m_movieCover->setWidth(0); // force recalculation TRACE("[mb]->%s:%d m_movieCover->getWidth(): %d\n", __func__, __LINE__, m_movieCover->getWidth()); 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->setYPos(movieCoverBox.iY + (movieCoverBox.iHeight - m_movieCover->getHeight())/2);