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

filebrowser: fix paint of SMSKey in footer and ...

Browse Source 
... align both buttonlines in footer to same width


Origin commit data
------------------
Commit: dc39bde14a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-31 (Sat, 31 May 2014)

Origin message was:
------------------
- filebrowser: fix paint of SMSKey in footer and ...

 ... align both buttonlines in footer to same width
This commit is contained in:
vanhofen
2014-05-31 17:54:29 +02:00
parent 3550e1e5c7
commit f1d1a39cf8
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gui/filebrowser.cpp
View File

@@ -298,6 +298,7 @@ void CFileBrowser::commonInit()
if (fheight == 0) if (fheight == 0)
fheight = 1; /* avoid div by zero on invalid font */ fheight = 1; /* avoid div by zero on invalid font */
foheight = fnt_small->getHeight()+6; //initial height value for buttonbar; TODO get value from buttonbar foheight = fnt_small->getHeight()+6; //initial height value for buttonbar; TODO get value from buttonbar
skwidth = 26;
liststart = 0; liststart = 0;
listmaxshow = std::max(1,(int)(height - theight - 2 * foheight)/fheight); listmaxshow = std::max(1,(int)(height - theight - 2 * foheight)/fheight);
@@ -782,6 +783,7 @@ bool CFileBrowser::exec(const char * const dirname)
if(!CRCInput::isNumeric(msg)) if(!CRCInput::isNumeric(msg))
{ {
m_SMSKeyInput.resetOldKey(); m_SMSKeyInput.resetOldKey();
paintSMSKey();
} }
if (msg == CRCInput::RC_yellow) if (msg == CRCInput::RC_yellow)
@@ -1383,15 +1385,16 @@ void CFileBrowser::paintFoot()
{ NEUTRINO_ICON_BUTTON_MUTE_SMALL , LOCALE_FILEBROWSER_DELETE }, { NEUTRINO_ICON_BUTTON_MUTE_SMALL , LOCALE_FILEBROWSER_DELETE },
}; };
// int iw = 0, ih = 0; //y first line
// frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &iw, &ih); int by1 = y + height - (2 * foheight );
//y second line
int by2 = by1 + foheight;
//width
int fowidth = width - skwidth;
//Background //background
int by0 = y + height - (2 * foheight ); frameBuffer->paintBoxRel(x, by1, width, (2 * foheight ), COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
frameBuffer->paintBoxRel(x, by0, width, (2 * foheight ), COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
//Second Line (bottom, top)
int by2 = by0 + foheight;
if (!(filelist.empty())) if (!(filelist.empty()))
{ {
@@ -1404,7 +1407,7 @@ void CFileBrowser::paintFoot()
num_buttons++; num_buttons++;
} }
//red, green, yellow button //red, green, yellow button
::paintButtons(x, by0, 0, num_buttons, FileBrowserButtons, width, foheight); ::paintButtons(x, by1, 0, num_buttons, FileBrowserButtons, fowidth, foheight);
/* TODO: the changing existence of the OK button makes the sort button /* TODO: the changing existence of the OK button makes the sort button
* shift its place :-( */ * shift its place :-( */
@@ -1417,16 +1420,26 @@ void CFileBrowser::paintFoot()
} }
if (strncmp(Path.c_str(), VLC_URI, strlen(VLC_URI)) != 0) // No delete in vlc mode if (strncmp(Path.c_str(), VLC_URI, strlen(VLC_URI)) != 0) // No delete in vlc mode
num_buttons++; num_buttons++;
/* width-26 to leave room for the SMSinput indicator */
::paintButtons(x, by2, 0, num_buttons, &(FileBrowserButtons2[idx]), width - 26, foheight);
if(m_SMSKeyInput.getOldKey()!=0) ::paintButtons(x, by2, 0, num_buttons, &(FileBrowserButtons2[idx]), fowidth, foheight);
{
char cKey[2]={m_SMSKeyInput.getOldKey(),0}; paintSMSKey();
cKey[0] = toupper(cKey[0]); }
int len = fnt_small->getRenderWidth(cKey); }
fnt_small->RenderString(x + width - 10 - len, by2 + foheight, len, cKey, COL_MENUHEAD_TEXT, 0, true);
} void CFileBrowser::paintSMSKey()
{
int skheight = fnt_small->getHeight();
//background
frameBuffer->paintBoxRel(x + width - skwidth, y + height - foheight - (skheight/2), skwidth, skheight, COL_INFOBAR_SHADOW_PLUS_1);
if(m_SMSKeyInput.getOldKey()!=0)
{
char cKey[2]={m_SMSKeyInput.getOldKey(),0};
cKey[0] = toupper(cKey[0]);
int len = fnt_small->getRenderWidth(cKey, true);
fnt_small->RenderString(x + width - skwidth, y + height - foheight + (skheight/2), len, cKey, COL_MENUHEAD_TEXT, 0, true);
} }
} }
@@ -1483,6 +1496,7 @@ void CFileBrowser::SMSInput(const neutrino_msg_t msg)
{ {
paintItem(selected - liststart); paintItem(selected - liststart);
} }
paintSMSKey();
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------

2
src/gui/filebrowser.h
View File

@@ -170,6 +170,7 @@ class CFileBrowser
int fheight; // Fonthoehe Filelist-Inhalt int fheight; // Fonthoehe Filelist-Inhalt
int theight; // Fonthoehe Filelist-Titel int theight; // Fonthoehe Filelist-Titel
int foheight; // Hoehe der button leiste int foheight; // Hoehe der button leiste
int skwidth; // width SMSKey field
std::string name; std::string name;
std::string base; std::string base;
std::string m_baseurl; std::string m_baseurl;
@@ -188,6 +189,7 @@ class CFileBrowser
void paint(); void paint();
void paintHead(); void paintHead();
void paintFoot(); void paintFoot();
void paintSMSKey();
void recursiveDelete(const char* file); void recursiveDelete(const char* file);
protected: protected: