[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-65-gd1d7282

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  d1d728263e78e1bbb10797adc44a380dc6162368 (commit)
       via  3c7bde553e4eaa96cecb4f295bac21046d51774b (commit)
      from  6c4303efe0bad86e1d152d2181ec12b8bb428034 (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 d1d728263e78e1bbb10797adc44a380dc6162368
Author: Michael Liebmann <tux...@gm...>
Date:   Thu Mar 21 20:03:34 2013 +0100

    CTextBox::scrollPageUp/Down: Suppress refresh when there is nothing to scroll
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/textbox.cpp b/tuxbox/neutrino/src/gui/widget/textbox.cpp
index 93c26e2..b28fa90 100644
--- a/tuxbox/neutrino/src/gui/widget/textbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/textbox.cpp
@@ -600,8 +600,10 @@ void CTextBox::scrollPageDown(const int pages)
 	{
 		m_nCurrentPage = m_nNrOfPages - 1;
 	}
+	int oldCurrentLine = m_nCurrentLine;
 	m_nCurrentLine = m_nCurrentPage * m_nLinesPerPage; 
-	refresh();
+	if (oldCurrentLine != m_nCurrentLine)
+		refresh();
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -627,8 +629,10 @@ void CTextBox::scrollPageUp(const int pages)
 	{
 		m_nCurrentPage = 0;
 	}
+	int oldCurrentLine = m_nCurrentLine;
 	m_nCurrentLine = m_nCurrentPage * m_nLinesPerPage; 
-	refresh();
+	if (oldCurrentLine != m_nCurrentLine)
+		refresh();
 }
 
 //////////////////////////////////////////////////////////////////////

commit 3c7bde553e4eaa96cecb4f295bac21046d51774b
Author: Christian Schuett <Gau...@ho...>
Date:   Thu Mar 21 19:57:48 2013 +0100

    Neutrino EPG Viewer: increase max width of more screenings button
    
    ensure that more screenings button caption will not be cut off
    even with standard font scale
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 3a6d67a..9ed2678 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -977,7 +977,7 @@ void CEpgData::showTimerEventBar(bool _show)
 
 	// Button: more screenings
 	if (!followlist.empty())
-		::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL],	g_Locale, sx + 8 + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2]);
+		::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL],	g_Locale, sx + 8 + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2], 2 * ButtonWidth - 2 * (ICON_LARGE_WIDTH + 2) - 4);
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/neutrino/src/gui/epgview.cpp        |    2 +-
 tuxbox/neutrino/src/gui/widget/textbox.cpp |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)


-- 
Tuxbox-GIT: apps