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

pictureviewer: small design reworks ...

Browse Source 
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a2143c68b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- pictureviewer: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-15 01:01:55 +02:00
committed by Thilo Graf
parent fd52e89afb
commit c708c24454
2 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/gui/pictureviewer.cpp
View File

@@ -162,19 +162,19 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
width = frameBuffer->getScreenWidthRel(); width = frameBuffer->getScreenWidthRel();
height = frameBuffer->getScreenHeightRel(); height = frameBuffer->getScreenHeightRel();
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); header_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); item_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
//get footerHeight from paintButtons //get footer_height from paintButtons
buttons1Height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); buttons1_height = ::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); buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false);
footerHeight = buttons1Height + buttons2Height; footer_height = buttons1_height + buttons2_height;
listmaxshow = (height-theight-footerHeight)/(fheight); listmaxshow = (height - header_height - footer_height)/item_height;
height = theight+listmaxshow*fheight+footerHeight; // recalc height height = header_height + listmaxshow*item_height + footer_height; // recalc height
x=getScreenStartX( width ); x=getScreenStartX(width);
y=getScreenStartY( height ); y=getScreenStartY(height);
m_viewer->SetScaling((CPictureViewer::ScalingMode)g_settings.picviewer_scaling); m_viewer->SetScaling((CPictureViewer::ScalingMode)g_settings.picviewer_scaling);
m_viewer->SetVisible(g_settings.screen_StartX, g_settings.screen_EndX, g_settings.screen_StartY, g_settings.screen_EndY); m_viewer->SetVisible(g_settings.screen_StartX, g_settings.screen_EndX, g_settings.screen_StartY, g_settings.screen_EndY);
@@ -660,7 +660,7 @@ void CPictureViewerGui::hide()
void CPictureViewerGui::paintItem(int pos) void CPictureViewerGui::paintItem(int pos)
{ {
// printf("paintItem{\n"); // printf("paintItem{\n");
int ypos = y+ theight + 0 + pos*fheight; int ypos = y + header_height + pos*item_height;
unsigned int currpos = liststart + pos; unsigned int currpos = liststart + pos;
@@ -678,8 +678,8 @@ void CPictureViewerGui::paintItem(int pos)
i_radius = RADIUS_LARGE; i_radius = RADIUS_LARGE;
if (i_radius) if (i_radius)
frameBuffer->paintBoxRel(x, ypos, width - 15, fheight, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x, ypos, width - SCROLLBAR_WIDTH, item_height, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x, ypos, width - 15, fheight, bgcolor, i_radius); frameBuffer->paintBoxRel(x, ypos, width - SCROLLBAR_WIDTH, item_height, bgcolor, i_radius);
if (currpos < playlist.size()) if (currpos < playlist.size())
{ {
@@ -690,8 +690,8 @@ void CPictureViewerGui::paintItem(int pos)
char timestring[18]; char timestring[18];
strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&playlist[currpos].Date)); strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&playlist[currpos].Date));
int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(timestring); int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(timestring);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+fheight, width-30 - w, tmp, color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + OFFSET_INNER_MID, ypos + item_height, width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - w, tmp, color, item_height);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+width-20-w,ypos+fheight, w, timestring, color, fheight); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - w, ypos + item_height, w, timestring, color, item_height);
} }
// printf("paintItem}\n"); // printf("paintItem}\n");
@@ -701,7 +701,7 @@ void CPictureViewerGui::paintItem(int pos)
void CPictureViewerGui::paintHead() void CPictureViewerGui::paintHead()
{ {
CComponentsHeaderLocalized header(x, y, width, theight, LOCALE_PICTUREVIEWER_HEAD, NEUTRINO_ICON_MP3, CComponentsHeaderLocalized::CC_BTN_HELP); CComponentsHeaderLocalized header(x, y, width, header_height, LOCALE_PICTUREVIEWER_HEAD, NEUTRINO_ICON_PICTUREVIEWER, CComponentsHeaderLocalized::CC_BTN_HELP);
#ifdef ENABLE_GUI_MOUNT #ifdef ENABLE_GUI_MOUNT
header.setContextButton(NEUTRINO_ICON_BUTTON_MENU); header.setContextButton(NEUTRINO_ICON_BUTTON_MENU);
@@ -719,15 +719,15 @@ void CPictureViewerGui::paintFoot()
else else
PictureViewerButtons2[0].locale = LOCALE_PICTUREVIEWER_SORTORDER_DATE; PictureViewerButtons2[0].locale = LOCALE_PICTUREVIEWER_SORTORDER_DATE;
frameBuffer->paintBoxRel(x, y + (height - footerHeight), width, footerHeight, COL_MENUFOOT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); frameBuffer->paintBoxRel(x, y + (height - footer_height), width, footer_height, COL_MENUFOOT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
if (!playlist.empty()) if (!playlist.empty())
{ {
::paintButtons(x, y + (height - footerHeight), 0, PictureViewerButtons1Count, PictureViewerButtons1, width); ::paintButtons(x, y + (height - footer_height), 0, PictureViewerButtons1Count, PictureViewerButtons1, width);
::paintButtons(x, y + (height - buttons2Height), 0, PictureViewerButtons2Count, PictureViewerButtons2, width); ::paintButtons(x, y + (height - buttons2_height), 0, PictureViewerButtons2Count, PictureViewerButtons2, width);
} }
else else
::paintButtons(x, y + (height - footerHeight), 0, 1, &(PictureViewerButtons1[1]), width); ::paintButtons(x, y + (height - footer_height), 0, 1, &(PictureViewerButtons1[1]), width);
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@@ -748,19 +748,12 @@ void CPictureViewerGui::paint()
paintItem(count); paintItem(count);
} }
int ypos = y+ theight; //scrollbar
int sb = fheight* listmaxshow; int _listmaxshow = listmaxshow ? listmaxshow : 1; //avoid division by zero
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0); int total_pages = playlist.size() == 0 ? 1 : ((playlist.size() - 1) / _listmaxshow) + 1;
int current_page = selected / _listmaxshow;
unsigned int tmp_max = listmaxshow; paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
if(!tmp_max)
tmp_max = 1;
int sbc= ((playlist.size()- 1)/ tmp_max)+ 1;
int sbs= (selected/tmp_max);
if (sbc < 1)
sbc = 1;
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0);
paintFoot(); paintFoot();
paintInfo(); paintInfo();

10
src/gui/pictureviewer.h
View File

@@ -74,11 +74,11 @@ class CPictureViewerGui : public CMenuTarget
unsigned int selected; unsigned int selected;
unsigned int liststart; unsigned int liststart;
unsigned int listmaxshow; unsigned int listmaxshow;
int fheight; // Fonthoehe Playlist-Inhalt int item_height;
int theight; // Fonthoehe Playlist-Titel int header_height;
int footerHeight; int footer_height;
int buttons1Height; int buttons1_height;
int buttons2Height; int buttons2_height;
bool visible; bool visible;
State m_state; State m_state;
SortOrder m_sort; SortOrder m_sort;