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

pictureviewer: add shadow to gui-elements

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b71a3bb19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- pictureviewer: add shadow to gui-elements

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-19 13:00:05 +02:00
parent 1038b22e2d
commit 9b3a71b1f3
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/pictureviewer.cpp
View File

@@ -175,8 +175,8 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false);
footer_height = buttons1_height + buttons2_height; footer_height = buttons1_height + buttons2_height;
listmaxshow = (height - header_height - footer_height)/item_height; listmaxshow = (height - header_height - footer_height - OFFSET_SHADOW)/item_height;
height = header_height + listmaxshow*item_height + footer_height; // recalc height height = header_height + listmaxshow*item_height + footer_height + OFFSET_SHADOW; // recalc height
x=getScreenStartX(width); x=getScreenStartX(width);
y=getScreenStartY(height); y=getScreenStartY(height);
@@ -713,6 +713,7 @@ void CPictureViewerGui::paintItem(int pos)
void CPictureViewerGui::paintHead() void CPictureViewerGui::paintHead()
{ {
CComponentsHeaderLocalized header(x, y, width, header_height, LOCALE_PICTUREVIEWER_HEAD, NEUTRINO_ICON_PICTUREVIEWER, CComponentsHeaderLocalized::CC_BTN_HELP); CComponentsHeaderLocalized header(x, y, width, header_height, LOCALE_PICTUREVIEWER_HEAD, NEUTRINO_ICON_PICTUREVIEWER, CComponentsHeaderLocalized::CC_BTN_HELP);
header.enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT, -1, true);
#ifdef ENABLE_GUI_MOUNT #ifdef ENABLE_GUI_MOUNT
header.setContextButton(NEUTRINO_ICON_BUTTON_MENU); header.setContextButton(NEUTRINO_ICON_BUTTON_MENU);
@@ -730,15 +731,20 @@ void CPictureViewerGui::paintFoot()
else else
PictureViewerButtons2[0].locale = LOCALE_PICTUREVIEWER_SORTORDER_DATE; PictureViewerButtons2[0].locale = LOCALE_PICTUREVIEWER_SORTORDER_DATE;
frameBuffer->paintBoxRel(x, y + (height - footer_height), width, footer_height, COL_MENUFOOT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); int footer_y = y + (height - footer_height - OFFSET_SHADOW);
// shadow
frameBuffer->paintBoxRel(x + OFFSET_SHADOW, footer_y + OFFSET_SHADOW, width, footer_height, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
frameBuffer->paintBoxRel(x, footer_y, width, footer_height, COL_MENUFOOT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
if (!playlist.empty()) if (!playlist.empty())
{ {
::paintButtons(x, y + (height - footer_height), 0, PictureViewerButtons1Count, PictureViewerButtons1, width); ::paintButtons(x, footer_y, width, PictureViewerButtons1Count, PictureViewerButtons1, width, buttons1_height);
::paintButtons(x, y + (height - buttons2_height), 0, PictureViewerButtons2Count, PictureViewerButtons2, width); ::paintButtons(x, footer_y + buttons1_height, width, PictureViewerButtons2Count, PictureViewerButtons2, width, buttons2_height);
} }
else else
::paintButtons(x, y + (height - footer_height), 0, 1, &(PictureViewerButtons1[1]), width); ::paintButtons(x, footer_y, width, 1, &(PictureViewerButtons1[1]), width, buttons1_height);
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@@ -766,6 +772,9 @@ void CPictureViewerGui::paint()
paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page); paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
// shadow
frameBuffer->paintBoxRel(x + width, y + header_height + OFFSET_SHADOW, OFFSET_SHADOW, item_height*listmaxshow, COL_SHADOW_PLUS_0);
paintFoot(); paintFoot();
paintInfo(); paintInfo();