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

menu: rework slider; ...

Browse Source 
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c22aa7058
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-14 21:37:44 +02:00
parent b5415cb413
commit 68f37aaddd
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gui/widget/menue.cpp
View File

@@ -304,25 +304,45 @@ void CMenuItem::prepareItem(const bool select_mode, const int &item_height)
void CMenuItem::paintItemSlider( const bool select_mode, const int &item_height, const int &optionvalue, const int &factor, const char * left_text, const char * right_text) void CMenuItem::paintItemSlider( const bool select_mode, const int &item_height, const int &optionvalue, const int &factor, const char * left_text, const char * right_text)
{ {
CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
int slider_lenght = 0, h = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_VOLUMEBODY, &slider_lenght, &h);
if(slider_lenght == 0 || factor < optionvalue )
return;
int stringwidth = 0;
if (right_text != NULL) {
stringwidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("U999");
}
int stringwidth2 = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(left_text);
int maxspace = dx - stringwidth - icon_frame_w - stringwidth2 - OFFSET_INNER_MID; // assuming all sliders have same dimensions
if(maxspace < slider_lenght) int slider_width, dummy;
frameBuffer->getIconSize(NEUTRINO_ICON_VOLUMESLIDER2ALPHA, &slider_width, &dummy);
int bar_width = frameBuffer->scale2Res(100);
/*
We have a half slider_width before and after the bar
to get the middle of the slider at the point of choise
*/
int bar_offset = slider_width/2;
int bar_full = bar_width + slider_width;
// avoid division by zero
if (factor < optionvalue || factor < 1)
return;
int right_needed = 0;
if (right_text != NULL)
{
right_needed = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("U999");
}
int left_needed = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(left_text);
int space = dx - right_needed - icon_frame_w - left_needed - OFFSET_INNER_MID;
if (space < bar_full)
return ; return ;
int stringstartposOption = x + dx - stringwidth - slider_lenght; int bar_x = x + dx - right_needed - bar_full;
// FIXME: negative optionvalues falsifies the slider on the right side
int optionV = (optionvalue < 0) ? 0 : optionvalue; int optionV = (optionvalue < 0) ? 0 : optionvalue;
frameBuffer->paintBoxRel(stringstartposOption, y, slider_lenght, item_height, item_bgcolor);
frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, stringstartposOption, y+2+item_height/4); // clear area
frameBuffer->paintIcon(select_mode ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (stringstartposOption + (optionV * 100 / factor)), y+item_height/4); frameBuffer->paintBoxRel(bar_x, y, bar_full, item_height, item_bgcolor);
// paint bar
frameBuffer->paintBoxFrame(bar_x + bar_offset, y + item_height/3, bar_width, item_height/3, 1, COL_MENUCONTENT_TEXT);
// paint slider
frameBuffer->paintIcon(select_mode ? NEUTRINO_ICON_VOLUMESLIDER2ALPHA : NEUTRINO_ICON_VOLUMESLIDER2, bar_x + (optionV*bar_width / factor), y, item_height);
} }
void CMenuItem::paintItemButton(const bool select_mode, int item_height, const char * const icon_Name) void CMenuItem::paintItemButton(const bool select_mode, int item_height, const char * const icon_Name)