Implemented cSkinCursesDisplayMenu::SetScrollbar(); fixed calculating the scrollbar sizes in the skins

This commit is contained in:
Klaus Schmidinger 2008-02-17 14:29:24 +01:00
parent 484821fa0a
commit 31a0318de4
5 changed files with 42 additions and 27 deletions

View File

@ -5639,6 +5639,7 @@ Video Disk Recorder Revision History
- Added missing #include <limits.h> to epg.c and menuitems.h (thanks to Ville Skyttä). - Added missing #include <limits.h> to epg.c and menuitems.h (thanks to Ville Skyttä).
- The new function cSkin::SetScrollbar() can be implemented by skins to display - The new function cSkin::SetScrollbar() can be implemented by skins to display
a scrollbar in every list menu. The 'classic' and 'sttng' skins have been a scrollbar in every list menu. The 'classic' and 'sttng' skins have been
changed accordingly. changed accordingly, as well as the 'skincurses' plugin.
- Introduced 'operator const void * ()' in cString to catch cases where operator*() - Introduced 'operator const void * ()' in cString to catch cases where operator*()
should be used. should be used.
- Fixed calculating the scrollbar sizes in the skins.

View File

@ -66,6 +66,7 @@ VDR Plugin 'skincurses' Revision History
- Updated the Makefile of the skincurses plugin (thanks to Rolf Ahrenberg). - Updated the Makefile of the skincurses plugin (thanks to Rolf Ahrenberg).
2008-02-15: 2008-02-15: Version 0.1.5
- Using cString::sprintf() instead of asprintf(). - Using cString::sprintf() instead of asprintf().
- Implemented cSkinCursesDisplayMenu::SetScrollbar().

View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: skincurses.c 1.19 2008/02/15 14:52:03 kls Exp $ * $Id: skincurses.c 1.20 2008/02/17 14:28:19 kls Exp $
*/ */
#include <ncurses.h> #include <ncurses.h>
@ -166,7 +166,7 @@ void cCursesOsd::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Co
} }
SetColor(ColorFg, ColorBg); SetColor(ColorFg, ColorBg);
wmove(window, y, x); // ncurses wants 'y' before 'x'! wmove(window, y, x); // ncurses wants 'y' before 'x'!
waddnstr(window, s, ScOsdWidth - x); waddnstr(window, s, Width ? Width : ScOsdWidth - x);
} }
void cCursesOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color) void cCursesOsd::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
@ -261,7 +261,8 @@ void cSkinCursesDisplayChannel::Flush(void)
class cSkinCursesDisplayMenu : public cSkinDisplayMenu { class cSkinCursesDisplayMenu : public cSkinDisplayMenu {
private: private:
cOsd *osd; cOsd *osd;
void SetScrollbar(void); void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
void SetTextScrollbar(void);
public: public:
cSkinCursesDisplayMenu(void); cSkinCursesDisplayMenu(void);
virtual ~cSkinCursesDisplayMenu(); virtual ~cSkinCursesDisplayMenu();
@ -272,6 +273,7 @@ public:
virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL); virtual void SetButtons(const char *Red, const char *Green = NULL, const char *Yellow = NULL, const char *Blue = NULL);
virtual void SetMessage(eMessageType Type, const char *Text); virtual void SetMessage(eMessageType Type, const char *Text);
virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable); virtual void SetItem(const char *Text, int Index, bool Current, bool Selectable);
virtual void SetScrollbar(int Total, int Offset);
virtual void SetEvent(const cEvent *Event); virtual void SetEvent(const cEvent *Event);
virtual void SetRecording(const cRecording *Recording); virtual void SetRecording(const cRecording *Recording);
virtual void SetText(const char *Text, bool FixedFont); virtual void SetText(const char *Text, bool FixedFont);
@ -290,25 +292,31 @@ cSkinCursesDisplayMenu::~cSkinCursesDisplayMenu()
delete osd; delete osd;
} }
void cSkinCursesDisplayMenu::SetScrollbar(void) void cSkinCursesDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown)
{ {
if (textScroller.CanScroll()) { if (Total > 0 && Total > Shown) {
int yt = textScroller.Top(); int yt = Top;
int yb = yt + textScroller.Height() - 1; int yb = yt + Height - 1;
int st = yt; int st = yt;
int sb = yb; int sb = yb;
int tt = st + (sb - st) * textScroller.Offset() / textScroller.Total(); int tt = st + (sb - st + 1) * Offset / Total;
int tb = tt + (sb - st) * textScroller.Shown() / textScroller.Total(); int tb = tt + (sb - st + 1) * Shown / Total;
int xl = ScOsdWidth - 1; int xl = ScOsdWidth - 1;
osd->DrawRectangle(xl, st, xl, sb, clrCyan); osd->DrawRectangle(xl, st, xl, sb, clrWhite);
osd->DrawRectangle(xl, tt, xl, tb, clrWhite); osd->DrawRectangle(xl, tt, xl, tb, clrCyan);
} }
} }
void cSkinCursesDisplayMenu::SetTextScrollbar(void)
{
if (textScroller.CanScroll())
DrawScrollbar(textScroller.Total(), textScroller.Offset(), textScroller.Shown(), textScroller.Top(), textScroller.Height(), textScroller.CanScrollUp(), textScroller.CanScrollDown());
}
void cSkinCursesDisplayMenu::Scroll(bool Up, bool Page) void cSkinCursesDisplayMenu::Scroll(bool Up, bool Page)
{ {
cSkinDisplayMenu::Scroll(Up, Page); cSkinDisplayMenu::Scroll(Up, Page);
SetScrollbar(); SetTextScrollbar();
} }
int cSkinCursesDisplayMenu::MaxItems(void) int cSkinCursesDisplayMenu::MaxItems(void)
@ -366,12 +374,17 @@ void cSkinCursesDisplayMenu::SetItem(const char *Text, int Index, bool Current,
const char *s = GetTabbedText(Text, i); const char *s = GetTabbedText(Text, i);
if (s) { if (s) {
int xt = Tab(i) / 12;// Tab() is in "pixel" - see also skins.c!!! int xt = Tab(i) / 12;// Tab() is in "pixel" - see also skins.c!!!
osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, ScOsdWidth - xt); osd->DrawText(xt, y, s, ColorFg, ColorBg, &Font, ScOsdWidth - 2 - xt);
} }
if (!Tab(i + 1)) if (!Tab(i + 1))
break; break;
} }
SetEditableWidth(ScOsdWidth - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!! SetEditableWidth(ScOsdWidth - 2 - Tab(1) / 12); // Tab() is in "pixel" - see also skins.c!!!
}
void cSkinCursesDisplayMenu::SetScrollbar(int Total, int Offset)
{
DrawScrollbar(Total, Offset, MaxItems(), 2, MaxItems(), Offset > 0, Offset + MaxItems() < Total);
} }
void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event) void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
@ -398,7 +411,7 @@ void cSkinCursesDisplayMenu::SetEvent(const cEvent *Event)
y += 1; y += 1;
if (!isempty(Event->Description())) { if (!isempty(Event->Description())) {
textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground); textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Event->Description(), &Font, clrCyan, clrBackground);
SetScrollbar(); SetTextScrollbar();
} }
} }
@ -426,14 +439,14 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording)
y += 1; y += 1;
if (!isempty(Info->Description())) { if (!isempty(Info->Description())) {
textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground); textScroller.Set(osd, 0, y, ScOsdWidth - 2, ScOsdHeight - y - 2, Info->Description(), &Font, clrCyan, clrBackground);
SetScrollbar(); SetTextScrollbar();
} }
} }
void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont) void cSkinCursesDisplayMenu::SetText(const char *Text, bool FixedFont)
{ {
textScroller.Set(osd, 0, 2, ScOsdWidth - 2, ScOsdHeight - 4, Text, &Font, clrWhite, clrBackground); textScroller.Set(osd, 0, 2, ScOsdWidth - 2, ScOsdHeight - 4, Text, &Font, clrWhite, clrBackground);
SetScrollbar(); SetTextScrollbar();
} }
void cSkinCursesDisplayMenu::Flush(void) void cSkinCursesDisplayMenu::Flush(void)

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: skinclassic.c 1.24 2008/02/17 13:55:54 kls Exp $ * $Id: skinclassic.c 1.25 2008/02/17 14:23:36 kls Exp $
*/ */
#include "skinclassic.h" #include "skinclassic.h"
@ -233,11 +233,11 @@ void cSkinClassicDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, in
{ {
if (Total > 0 && Total > Shown) { if (Total > 0 && Total > Shown) {
int yt = Top; int yt = Top;
int yb = yt + Height; int yb = yt + Height - 1;
int st = yt; int st = yt;
int sb = yb; int sb = yb;
int tt = st + (sb - st) * Offset / Total; int tt = st + (sb - st + 1) * Offset / Total;
int tb = tt + (sb - st) * Shown / Total; int tb = tt + (sb - st + 1) * Shown / Total;
int xl = x3 - ScrollWidth; int xl = x3 - ScrollWidth;
osd->DrawRectangle(xl, st, x3 - 1, sb, Theme.Color(clrMenuScrollbarTotal)); osd->DrawRectangle(xl, st, x3 - 1, sb, Theme.Color(clrMenuScrollbarTotal));
osd->DrawRectangle(xl, tt, x3 - 1, tb, Theme.Color(clrMenuScrollbarShown)); osd->DrawRectangle(xl, tt, x3 - 1, tb, Theme.Color(clrMenuScrollbarShown));

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: skinsttng.c 1.25 2008/02/17 13:35:09 kls Exp $ * $Id: skinsttng.c 1.26 2008/02/17 14:23:45 kls Exp $
*/ */
// Star Trek: The Next Generation® is a registered trademark of Paramount Pictures // Star Trek: The Next Generation® is a registered trademark of Paramount Pictures
@ -442,11 +442,11 @@ void cSkinSTTNGDisplayMenu::DrawScrollbar(int Total, int Offset, int Shown, int
if (Total > 0 && Total > Shown) { if (Total > 0 && Total > Shown) {
int h = lineHeight; int h = lineHeight;
int yt = Top; int yt = Top;
int yb = yt + Height; int yb = yt + Height - 1;
int st = yt + h + Gap; int st = yt + h + Gap;
int sb = yb - h - Gap; int sb = yb - h - Gap;
int tt = st + (sb - st) * Offset / Total; int tt = st + (sb - st + 1) * Offset / Total;
int tb = tt + (sb - st) * Shown / Total; int tb = tt + (sb - st + 1) * Shown / Total;
osd->DrawRectangle(x5, st, x5 + ScrollWidth - 1, sb, Theme.Color(clrMenuScrollbarTotal)); osd->DrawRectangle(x5, st, x5 + ScrollWidth - 1, sb, Theme.Color(clrMenuScrollbarTotal));
osd->DrawRectangle(x5, tt, x5 + ScrollWidth - 1, tb, Theme.Color(clrMenuScrollbarShown)); osd->DrawRectangle(x5, tt, x5 + ScrollWidth - 1, tb, Theme.Color(clrMenuScrollbarShown));
osd->DrawRectangle(x5, yt, x6 - 1, yt + h - 1, frameColor); osd->DrawRectangle(x5, yt, x6 - 1, yt + h - 1, frameColor);