mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-14 22:05:07 +02:00
parent 9a3cbda5f5 1c1c5a05f3
commit 1a26af0576
28 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/pictureviewer.cpp
View File

@@ -172,8 +172,8 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
//get footerHeight from paintButtons
buttons1Height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, "", false, COL_INFOBAR_SHADOW_TEXT, NULL, 0, false);
buttons2Height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_INFOBAR_SHADOW_TEXT, NULL, 0, false);
buttons1Height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false);
buttons2Height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false);
footerHeight = buttons1Height + buttons2Height;
listmaxshow = (height-theight-footerHeight)/(fheight);
@@ -739,7 +739,7 @@ void CPictureViewerGui::paintFoot()
else
PictureViewerButtons2[0].locale = LOCALE_PICTUREVIEWER_SORTORDER_DATE;
frameBuffer->paintBoxRel(x, y + (height - footerHeight), width, footerHeight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_LARGE, CORNER_BOTTOM);
frameBuffer->paintBoxRel(x, y + (height - footerHeight), width, footerHeight, COL_SHADOW_PLUS_1, RADIUS_LARGE, CORNER_BOTTOM);
if (!playlist.empty())
{