[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-353-gcf8cb29
Tuxbox Sources
Brought to you by:
dbt1
|
From: Thilo G. <tux...@ne...> - 2014-02-10 18:57:12
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via cf8cb2930a77a63080cdd0af93e711702a5526fa (commit)
from 62e610549182843a26c04ed04e5fd6b9cbd807f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf8cb2930a77a63080cdd0af93e711702a5526fa
Author: Christian Schuett <Gau...@ho...>
Date: Mon Feb 10 19:43:58 2014 +0100
Neutrino plugin list: only show full window if necessary
just to be conform with bookmark and timer list
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/bookmarkmanager.cpp b/tuxbox/neutrino/src/gui/bookmarkmanager.cpp
index 51bb9bf..002a001 100644
--- a/tuxbox/neutrino/src/gui/bookmarkmanager.cpp
+++ b/tuxbox/neutrino/src/gui/bookmarkmanager.cpp
@@ -240,12 +240,11 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
height = h_max(576, 50);
listmaxshow = (height-theight-footHeight-0)/(fheight*2);
- height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
if(bookmarks.size() < listmaxshow)
{
listmaxshow=bookmarks.size();
- height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
}
+ height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
if (!bookmarks.empty() && selected==bookmarks.size())
{
selected=bookmarks.size()-1;
diff --git a/tuxbox/neutrino/src/gui/pluginlist.cpp b/tuxbox/neutrino/src/gui/pluginlist.cpp
index f1d4818..d17d7a1 100644
--- a/tuxbox/neutrino/src/gui/pluginlist.cpp
+++ b/tuxbox/neutrino/src/gui/pluginlist.cpp
@@ -289,6 +289,8 @@ void CPluginList::paint()
fheight = fheight1 + fheight2 + 2;
//
listmaxshow = (height-theight-0)/fheight;
+ if (pluginlist.size() < listmaxshow)
+ listmaxshow = pluginlist.size();
height = theight+0+listmaxshow*fheight; // recalc height
sb_width = (pluginlist.size() > listmaxshow) ? 15 : 0;
x = getScreenStartX(width + sb_width);
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 7e2d2e5..d567998 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -401,12 +401,11 @@ void CTimerList::updateEvents(void)
width = w_max(600, 50);
height = h_max(576, 50);
listmaxshow = (height-theight-footHeight-0)/(fheight*2);
- height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
if(timerlist.size() < listmaxshow)
{
listmaxshow=timerlist.size();
- height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
}
+ height = theight+footHeight+0+listmaxshow*fheight*2; // recalc height
if (!timerlist.empty() && selected >= timerlist.size())
{
selected=timerlist.size()-1;
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/bookmarkmanager.cpp | 3 +--
tuxbox/neutrino/src/gui/pluginlist.cpp | 2 ++
tuxbox/neutrino/src/gui/timerlist.cpp | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
|