mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1387,7 +1387,8 @@ void CTimerList::paintHead()
|
||||
header = new CComponentsHeader(x, y, width, header_height, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON);
|
||||
header->enableClock(true, " %d.%m.%Y - %H:%M ", NULL, false);
|
||||
}
|
||||
header->paint(CC_SAVE_SCREEN_NO);
|
||||
if(!header->isPainted())
|
||||
header->paint(CC_SAVE_SCREEN_NO);
|
||||
}
|
||||
|
||||
void CTimerList::paintFoot()
|
||||
@@ -1413,9 +1414,9 @@ void CTimerList::paintFoot()
|
||||
footer.enableShadow(CC_SHADOW_ON, -1, true);
|
||||
|
||||
if (timerlist.empty())
|
||||
footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, 2, &(TimerListButtons[1]));
|
||||
footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, 2, &(TimerListButtons[1]), width/(2+1));
|
||||
else
|
||||
footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, c, TimerListButtons);
|
||||
footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, width, footer_height, c, TimerListButtons, width/(c-1));
|
||||
}
|
||||
|
||||
void CTimerList::paint()
|
||||
|
Reference in New Issue
Block a user