From bad892af5f789da98c503db2a77b33f01ce3fd69 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 26 Jan 2014 20:30:41 +0100 Subject: [PATCH] revert 8919d0aba0f9473a1c0f4ab110e907ef3712ebb2 use an easier solution, based up neutrino-mp Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bcf4e4fbf95668ccf945ce517838160be5564cb9 Author: Thilo Graf Date: 2014-01-26 (Sun, 26 Jan 2014) ------------------ This commit was generated by Migit --- src/gui/bedit/bouqueteditor_bouquets.cpp | 6 ++---- src/gui/bookmarkmanager.cpp | 4 ++-- src/gui/bouquetlist.cpp | 4 ++-- src/gui/eventlist.cpp | 9 +++++---- src/gui/pictureviewer.cpp | 7 +++---- src/gui/timerlist.cpp | 9 +++++---- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 804ccea25..98d9d4949 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -121,14 +121,12 @@ void CBEBouquetWidget::paint() frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); int sbc= ((Bouquets->size()- 1)/ listmaxshow)+ 1; + int sbs= (selected/listmaxshow); if (sbc < 1) sbc = 1; - int sbh = ((sb - 4) * 1024) / sbc; - int sbs= (selected/listmaxshow); - //scrollbar - frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); } void CBEBouquetWidget::paintHead() diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 3a0ccb791..45dbee7e3 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -36,6 +36,7 @@ #include #include + #include #include #include @@ -456,9 +457,8 @@ void CBookmarkManager::paint() int sbc= ((bookmarks.size()- 1)/ listmaxshow)+ 1; if (sbc < 1) sbc = 1; - int sbh = ((sb - 4) * 1024) / sbc; - frameBuffer->paintBoxRel(x+width-13, ypos+2+(page_nr*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ page_nr * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); } paintFoot(); diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 10150efaa..bc8257e33 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -50,6 +50,7 @@ #include #include #include + #include #include @@ -634,8 +635,7 @@ void CBouquetList::paint() frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); int sbc= ((bsize - 1)/ listmaxshow)+ 1; /* bsize is > 0, so sbc is also > 0 */ - int sbh = ((sb - 4) * 1024) / sbc; int sbs= (selected/listmaxshow); - frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 712174f44..5b0815f69 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -32,6 +32,7 @@ #include #include #include + #include #include @@ -48,6 +49,7 @@ #include #include + #include #include #include @@ -918,13 +920,11 @@ void CNeutrinoEventList::paint(t_channel_id channel_id) frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); int sbc= ((evtlist.size()- 1)/ listmaxshow)+ 1; + int sbs= (selected/listmaxshow); if (sbc < 1) sbc = 1; - int sbh = ((sb - 4) * 1024) / sbc; - int sbs= (selected/listmaxshow); - - frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); } @@ -969,6 +969,7 @@ void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id) buttons[btn_cnt].locale = LOCALE_EVENTFINDER_SEARCH; // search button btn_cnt++; } + // Button: Timer Channelswitch if ((uint) g_settings.key_channelList_addremind != CRCInput::RC_nokey) { if (!g_settings.minimode) { diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index ceb216b61..10e5b1123 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -64,6 +64,7 @@ #include #include + #include #include @@ -757,13 +758,11 @@ void CPictureViewerGui::paint() frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); int sbc= ((playlist.size()- 1)/ listmaxshow)+ 1; + int sbs= (selected/listmaxshow); if (sbc < 1) sbc = 1; - int sbh = ((sb - 4) * 1024) / sbc; - int sbs= (selected/listmaxshow); - - frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3); + frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); paintFoot(); paintInfo(); diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 983c9d3c3..a841b56ba 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -47,8 +47,10 @@ #include #include + #include #include + #include #include #include @@ -376,7 +378,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey) parent->hide(); const char *action_str = "RecDir1"; if(chooserDir(timerlist[selected].recordingDir, true, action_str, sizeof(timerlist[selected].recordingDir)-1)) { - printf("[%s] new %s dir %s\n",__FILE__, action_str, timerlist[selected].recordingDir); + printf("[timerlist] new %s dir %s\n", action_str, timerlist[selected].recordingDir); } return menu_return::RETURN_REPAINT; } @@ -384,7 +386,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey) parent->hide(); const char *action_str = "RecDir2"; if(chooserDir(timerNew.recordingDir, true, action_str, sizeof(timerNew.recordingDir)-1)) { - printf("[%s] new %s dir %s\n",__FILE__, action_str, timerNew.recordingDir); + printf("[timerlist] new %s dir %s\n", action_str, timerNew.recordingDir); } return menu_return::RETURN_REPAINT; } @@ -917,9 +919,8 @@ void CTimerList::paint() frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); int sbc= ((timerlist.size()- 1)/ listmaxshow)+ 1; - int sbh = ((sb - 4) * 1024) / sbc; - frameBuffer->paintBoxRel(x+width-13, ypos+2+(page_nr*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL); + frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ page_nr * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL); } paintFoot();