summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--displaymenu.c33
-rw-r--r--displaymenu.h2
-rw-r--r--icons/default/timerActive.pngbin3865 -> 3901 bytes
-rw-r--r--icons/default/timerInactive.pngbin1468 -> 1467 bytes
-rw-r--r--icons/default/timerRecording.pngbin424 -> 428 bytes
5 files changed, 19 insertions, 16 deletions
diff --git a/displaymenu.c b/displaymenu.c
index 5e7d2031..e662234b 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -108,20 +108,28 @@ void cFlatDisplayMenu::SetMenuCategory(eMenuCategory MenuCategory) {
}
}
-void cFlatDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown) {
+void cFlatDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown, bool isContent) {
if( Total > 0 && Total > Shown ) {
if( isScrolling == false && ShowEvent == false && ShowRecording == false && ShowText == false ) {
isScrolling = true;
DecorBorderClearByFrom(BorderMenuItem);
ItemBorderDrawAllWithScrollbar();
ItemBorderClear();
- menuPixmap->DrawRectangle(cRect(menuItemWidth - scrollBarWidth + Config.decorBorderMenuItemSize, 0, scrollBarWidth + marginItem, scrollBarHeight), clrTransparent);
+ if( isContent )
+ menuPixmap->DrawRectangle(cRect(menuItemWidth - scrollBarWidth + Config.decorBorderMenuContentSize, 0, scrollBarWidth + marginItem, scrollBarHeight), clrTransparent);
+ else
+ menuPixmap->DrawRectangle(cRect(menuItemWidth - scrollBarWidth + Config.decorBorderMenuItemSize, 0, scrollBarWidth + marginItem, scrollBarHeight), clrTransparent);
+
}
} else if( ShowEvent == false && ShowRecording == false && ShowText == false ) {
isScrolling = false;
}
- ScrollbarDraw(scrollbarPixmap, menuItemWidth - scrollBarWidth + Config.decorBorderMenuItemSize*2 + marginItem, Top, Height, Total, Offset, Shown, CanScrollUp, CanScrollDown);
+ if( isContent )
+ ScrollbarDraw(scrollbarPixmap, menuItemWidth - scrollBarWidth + Config.decorBorderMenuContentSize*2 + marginItem, Top, Height, Total, Offset, Shown, CanScrollUp, CanScrollDown);
+ else
+ ScrollbarDraw(scrollbarPixmap, menuItemWidth - scrollBarWidth + Config.decorBorderMenuItemSize*2 + marginItem, Top, Height, Total, Offset, Shown, CanScrollUp, CanScrollDown);
+
}
void cFlatDisplayMenu::SetScrollbar(int Total, int Offset) {
@@ -880,7 +888,6 @@ void cFlatDisplayMenu::DrawItemExtraEvent(const cEvent *Event, cString EmptyText
bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current, bool Selectable) {
if( Config.MenuTimerView == 0 || !Timer )
return false;
- dsyslog("SetItemTimer View: %d", Config.MenuTimerView);
const cChannel *Channel = Timer->Channel();
const cEvent *Event = Timer->Event();
@@ -913,7 +920,6 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current
}
}
- dsyslog("ItemWidth: %d ItemHeight: %d", menuItemWidth, Height);
menuPixmap->DrawRectangle(cRect(Config.decorBorderMenuItemSize, y, menuItemWidth, Height), ColorBg);
int Left, Top;
@@ -1004,20 +1010,15 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current
else
File = Timer->File();
- dsyslog("day: %s", *day);
- dsyslog("name: %s", *name);
- dsyslog("File: %s", File);
- dsyslog("Left: %d Top: %d", Left, Top);
-
if( Config.MenuTimerView == 1 ) {
- buffer = cString::sprintf("%s%s%s %02d:%02d %02d:%02d %s",
+ buffer = cString::sprintf("%s%s%s. %02d:%02d - %02d:%02d %s",
*name, *name && **name ? " " : "", *day,
Timer->Start() / 100, Timer->Start() % 100,
Timer->Stop() / 100, Timer->Stop() % 100,
File);
menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
} else if( Config.MenuTimerView == 2 || Config.MenuTimerView == 3 ) {
- buffer = cString::sprintf("%s%s%s %02d:%02d %02d:%02d",
+ buffer = cString::sprintf("%s%s%s. %02d:%02d - %02d:%02d",
*name, *name && **name ? " " : "", *day,
Timer->Start() / 100, Timer->Start() % 100,
Timer->Stop() / 100, Timer->Stop() % 100);
@@ -1194,7 +1195,7 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) {
ContentSet( text.str().c_str(), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg) );
if( ContentScrollable() ) {
- DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal());
+ DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal(), true);
}
if( Config.MenuContentFullSize || ContentScrollable() )
@@ -1462,7 +1463,7 @@ void cFlatDisplayMenu::SetRecording(const cRecording *Recording) {
ContentSet( text.str().c_str(), Theme.Color(clrMenuRecFontInfo), Theme.Color(clrMenuRecBg) );
if( ContentScrollable() ) {
- DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal());
+ DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal(), true);
}
RecordingBorder.Left = cLeft;
@@ -1505,6 +1506,8 @@ void cFlatDisplayMenu::SetText(const char *Text, bool FixedFont) {
if( !ButtonsDrawn() )
Height += buttonsHeight + Config.decorBorderButtonSize*2;
+ menuItemWidth = Width;
+
bool contentScrollable = ContentWillItBeScrollable(Width, Height, Text, FixedFont);
if( contentScrollable ) {
Width -= scrollBarWidth;
@@ -1520,7 +1523,7 @@ void cFlatDisplayMenu::SetText(const char *Text, bool FixedFont) {
if( ContentScrollable() )
- DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal());
+ DrawScrollbar(ContentScrollTotal(), ContentScrollOffset(), ContentVisibleLines(), contentTop - scrollBarTop, ContentGetHeight(), ContentScrollOffset() > 0, ContentScrollOffset() + ContentVisibleLines() < ContentScrollTotal(), true);
if( Config.MenuContentFullSize || ContentScrollable() )
DecorBorderDraw(Left, Top, Width, ContentGetHeight(), Config.decorBorderMenuContentSize, Config.decorBorderMenuContentType,
diff --git a/displaymenu.h b/displaymenu.h
index 7a30133f..617a6a1c 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -38,7 +38,7 @@ class cFlatDisplayMenu : public cFlatBaseRender, public cSkinDisplayMenu {
std::string MainMenuText(std::string Text);
cString GetIconName(std::string element);
- void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
+ void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown, bool isContent = false);
int ItemsHeight(void);
bool CheckProgressBar(const char *text);
void DrawProgressBarFromText(cRect rec, cRect recBg, const char *bar, tColor ColorFg, tColor ColorBarFg, tColor ColorBg);
diff --git a/icons/default/timerActive.png b/icons/default/timerActive.png
index 9f8a8c1d..8ac093a5 100644
--- a/icons/default/timerActive.png
+++ b/icons/default/timerActive.png
Binary files differ
diff --git a/icons/default/timerInactive.png b/icons/default/timerInactive.png
index 02a1a2b5..cafccb69 100644
--- a/icons/default/timerInactive.png
+++ b/icons/default/timerInactive.png
Binary files differ
diff --git a/icons/default/timerRecording.png b/icons/default/timerRecording.png
index 791208f5..b3ea8388 100644
--- a/icons/default/timerRecording.png
+++ b/icons/default/timerRecording.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 04:58:46 +0000