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

channellist: always show hotkeys in history mode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7caec4c89
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-07-03 (Mon, 03 Jul 2023)

Origin message was:
------------------
- channellist: always show hotkeys in history mode

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2023-07-03 00:16:19 +02:00
parent f275dc8d73
commit f2add49303
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/channellist.cpp
View File

@@ -2142,29 +2142,26 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_LOCK, &icon_w, &icon_h); frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_LOCK, &icon_w, &icon_h);
frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_LOCK, x + OFFSET_INNER_MID + numwidth - icon_w, ypos, fheight); frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_LOCK, x + OFFSET_INNER_MID + numwidth - icon_w, ypos, fheight);
} }
else if (g_settings.channellist_show_numbers) else if (this->historyMode)
{ {
if (this->historyMode) // history mode only uses digits 0..9 as hotkeys
if (pos >= 0 && pos <= 9)
{ {
// history mode only uses digits 0..9 as hotkeys std::string h = to_string(pos);
if (pos >= 0 && pos <= 9) //frameBuffer->getIconSize(h.c_str(), &icon_w, &icon_h);
{ frameBuffer->paintIcon(h.c_str(), x + OFFSET_INNER_MID /*+ numwidth - icon_w*/, ypos, fheight);
std::string h = to_string(pos);
//frameBuffer->getIconSize(h.c_str(), &icon_w, &icon_h);
frameBuffer->paintIcon(h.c_str(), x + OFFSET_INNER_MID /*+ numwidth - icon_w*/, ypos, fheight);
}
else
{
//frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &icon_w, &icon_h);
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, x + OFFSET_INNER_MID /*+ numwidth - icon_w*/, ypos, fheight);
}
} }
else else
{ {
int numpos = x + OFFSET_INNER_MID + numwidth - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp); //frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &icon_w, &icon_h);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos, ypos + fheight, numwidth + 5, tmp, color, fheight); frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, x + OFFSET_INNER_MID /*+ numwidth - icon_w*/, ypos, fheight);
} }
} }
else if (g_settings.channellist_show_numbers)
{
int numpos = x + OFFSET_INNER_MID + numwidth - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos, ypos + fheight, numwidth + 5, tmp, color, fheight);
}
else if (!edit_state) else if (!edit_state)
{ {
numwidth = -5; numwidth = -5;