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

neutrino buttonbars: reworked painting of buttonbar in

Browse Source 
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e1f887af72
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)

Origin message was:
------------------
*neutrino buttonbars: reworked painting of buttonbar in
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2011-02-21 09:08:10 +00:00
parent 8577ab9794
commit b42893a5ea
20 changed files with 317 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -57,7 +57,7 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou
int icol_w, icol_h;
frameBuffer = CFrameBuffer::getInstance();
selected = 0;
ButtonHeight = 25;
ButtonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8;
iconoffset = 0;
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
@@ -153,17 +153,7 @@ const struct button_label CBEChannelWidgetButtons[4] =
void CBEChannelWidget::paintFoot()
{
int icol_w, icol_h, fh;
fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
ButtonHeight = std::max(fh, icol_h+4);
frameBuffer->paintBoxRel(x,y+height, width,ButtonHeight, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
//frameBuffer->paintHLine(x, x+width, y, COL_INFOBAR_SHADOW_PLUS_0);
//::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + height + 4, (width - 20) / 4, 4, CBEChannelWidgetButtons);
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + height, (width - 20) / 4, ButtonHeight, 4, CBEChannelWidgetButtons);
::paintButtons(x, y+height, width, 4, CBEChannelWidgetButtons, ButtonHeight);
}
void CBEChannelWidget::hide()