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 diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 9a8c29db3..d8fb76e77 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -465,22 +465,22 @@ void CMovieBrowser::initGlobalSettings(void) m_settings.browserFrameHeight = 65; /* percent */ m_settings.browserRowNr = 6; - m_settings.browserRowItem[0] = MB_INFO_CHANNEL; - m_settings.browserRowItem[1] = MB_INFO_TITLE; - m_settings.browserRowItem[2] = MB_INFO_RECORDDATE; - m_settings.browserRowItem[3] = MB_INFO_SIZE; + m_settings.browserRowItem[0] = MB_INFO_TITLE; //NI + m_settings.browserRowItem[1] = MB_INFO_SPACER; //NI + m_settings.browserRowItem[2] = MB_INFO_INFO1; //NI + m_settings.browserRowItem[3] = MB_INFO_SPACER; //NI m_settings.browserRowItem[4] = MB_INFO_LENGTH; - m_settings.browserRowItem[5] = MB_INFO_INFO1; + m_settings.browserRowItem[5] = MB_INFO_RECORDDATE; //NI m_settings.browserRowItem[6] = MB_INFO_MAX_NUMBER; m_settings.browserRowItem[7] = MB_INFO_MAX_NUMBER; m_settings.browserRowItem[8] = MB_INFO_MAX_NUMBER; - m_settings.browserRowWidth[0] = m_defaultRowWidth[m_settings.browserRowItem[0]]; - m_settings.browserRowWidth[1] = m_defaultRowWidth[m_settings.browserRowItem[1]]; - m_settings.browserRowWidth[2] = m_defaultRowWidth[m_settings.browserRowItem[2]]; - m_settings.browserRowWidth[3] = m_defaultRowWidth[m_settings.browserRowItem[3]]; - m_settings.browserRowWidth[4] = m_defaultRowWidth[m_settings.browserRowItem[4]]; - m_settings.browserRowWidth[5] = m_defaultRowWidth[m_settings.browserRowItem[5]]; + m_settings.browserRowWidth[0] = 36; //NI - title + m_settings.browserRowWidth[1] = 1; //NI - spacer + m_settings.browserRowWidth[2] = 36; //NI - info1 + m_settings.browserRowWidth[3] = 1; //NI - spacer + m_settings.browserRowWidth[4] = 11; //NI - length + m_settings.browserRowWidth[5] = 14; //NI - recorddate m_settings.browserRowWidth[6] = m_defaultRowWidth[m_settings.browserRowItem[6]]; m_settings.browserRowWidth[7] = m_defaultRowWidth[m_settings.browserRowItem[7]]; m_settings.browserRowWidth[8] = m_defaultRowWidth[m_settings.browserRowItem[8]]; @@ -1499,6 +1499,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); @@ -3824,6 +3826,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=""; diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 0f310b0f4..b55e5af3f 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -213,9 +213,9 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] = {LOCALE_FONTSIZE_INFOBAR_ECMINFO , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI {LOCALE_FONTSIZE_FILEBROWSER_ITEM , 16, CNeutrinoFonts::FONT_STYLE_BOLD , 1}, {LOCALE_FONTSIZE_MENU_HINT , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, - {LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 2}, - {LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, - {LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, + {LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 2}, //NI + {LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI + {LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI {LOCALE_FONTSIZE_SUBTITLES , 25, CNeutrinoFonts::FONT_STYLE_BOLD , 0} };