Skip to content

Commit

Permalink
MythUIText: Add attributes to <scroll>, allowing the themer to contro…
Browse files Browse the repository at this point in the history 
…l the

rate (pixels/second) and delay (in seconds).
  • Loading branch information
@jpoet
jpoet committed Dec 23, 2012
1 parent 63682c9 commit da78e80
Show file tree
Hide file tree
Showing 4 changed files with 189 additions and 96 deletions.
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythmainwindow.cpp
View file
Expand Up @@ -161,7 +161,7 @@ class MythMainWindowPrivate

sysEventHandler(NULL),

drawInterval(1000 / 70),
drawInterval(1000 / MythMainWindow::drawRefresh),
drawTimer(NULL),
mainStack(NULL),

Expand Down Expand Up @@ -1261,7 +1261,7 @@ void MythMainWindow::ReinitDone(void)
d->paintwin->raise();
ShowPainterWindow();

d->drawTimer->start(1000 / 70);
d->drawTimer->start(1000 / drawRefresh);
}

void MythMainWindow::Show(void)
Expand Down Expand Up @@ -1391,7 +1391,7 @@ void MythMainWindow::SetDrawEnabled(bool enable)
QApplication::postEvent(this, new QEvent(QEvent::UpdateRequest), Qt::LowEventPriority);
d->m_pendingUpdate = false;
}
d->drawTimer->start(1000 / 70);
d->drawTimer->start(1000 / drawRefresh);
ShowPainterWindow();
}
else
Expand Down
2 changes: 2 additions & 0 deletions mythtv/libs/libmythui/mythmainwindow.h
View file
Expand Up @@ -37,6 +37,8 @@ class MUI_PUBLIC MythMainWindow : public QWidget
friend class MythPainterWindowD3D9;

public:
enum {drawRefresh = 70};

void Init(QString forcedpainter = QString());
void ReinitDone(void);
void Show(void);
Expand Down
259 changes: 171 additions & 88 deletions mythtv/libs/libmythui/mythuitext.cpp
View file
Expand Up @@ -36,9 +36,14 @@ MythUIText::MythUIText(MythUIType *parent, const QString &name)
m_numSteps(0), m_curStep(0),
curR(0.0), curG(0.0), curB(0.0),
incR(0.0), incG(0.0), incB(0.0),
m_scrollPause(ScrollBounceDelay), m_scrollOffset(0),
m_scrollBounce(false), m_scrolling(false),
m_scrollDirection(ScrollNone), m_textCase(CaseNormal)
m_scrollStartDelay(ScrollBounceDelay),
m_scrollReturnDelay(ScrollBounceDelay), m_scrollPause(0),
m_scrollForwardRate(70.0 / MythMainWindow::drawRefresh),
m_scrollReturnRate(70.0 / MythMainWindow::drawRefresh),
m_scrollBounce(false), m_scrollOffset(0),
m_scrollPos(0), m_scrollPosWhole(0),
m_scrollDirection(ScrollNone), m_scrolling(false),
m_textCase(CaseNormal)
{
#if 0 // Not currently used
m_usingAltArea = false;
Expand Down Expand Up @@ -71,10 +76,18 @@ MythUIText::MythUIText(const QString &text, const MythFontProperties &font,
#endif
m_ShrinkNarrow = true;
m_MultiLine = false;
m_scrollPause = ScrollBounceDelay;

m_scrollStartDelay = m_scrollReturnDelay = ScrollBounceDelay;
m_scrollPause = 0;
m_scrollForwardRate = m_scrollReturnRate =
70.0 / MythMainWindow::drawRefresh;
m_scrollBounce = false;
m_scrolling = false;
m_scrollOffset = 0;
m_scrollPos = 0;
m_scrollPosWhole = 0;
m_scrollDirection = ScrollNone;
m_scrolling = false;

m_textCase = CaseNormal;
m_Ascent = m_Descent = m_leftBearing = m_rightBearing = 0;
m_Leading = 1;
Expand Down Expand Up @@ -803,7 +816,7 @@ void MythUIText::FillCutMessage(void)
min_rect, last_line_width, num_lines, true);

m_Canvas.setRect(0, 0, min_rect.x() + min_rect.width(), height);
m_scrollPause = ScrollBounceDelay;
m_scrollPause = m_scrollStartDelay; // ????
m_scrollBounce = false;

/**
Expand Down Expand Up @@ -1037,102 +1050,127 @@ void MythUIText::Pulse(void)

if (m_scrolling)
{
switch (m_scrollDirection)
int whole;

if (m_scrollPause > 0)
--m_scrollPause;
else
{
case ScrollLeft :
if (m_Canvas.width() > m_drawRect.width())
{
ShiftCanvas(-1, 0);
if (m_Canvas.x() + m_Canvas.width() < 0)
SetCanvasPosition(m_drawRect.width(), 0);
}
break;
case ScrollRight :
if (m_Canvas.width() > m_drawRect.width())
if (m_scrollBounce)
m_scrollPos += m_scrollReturnRate;
else
m_scrollPos += m_scrollForwardRate;
}

whole = static_cast<int>(m_scrollPos);
if (m_scrollPosWhole != whole)
{
int shift = whole - m_scrollPosWhole;
m_scrollPosWhole = whole;

switch (m_scrollDirection)
{
ShiftCanvas(1, 0);
if (m_Canvas.x() > m_drawRect.width())
SetCanvasPosition(-m_Canvas.width(), 0);
}
break;
case ScrollHorizontal:
if (m_Canvas.width() <= m_drawRect.width())
case ScrollLeft :
if (m_Canvas.width() > m_drawRect.width())
{
ShiftCanvas(-shift, 0);
if (m_Canvas.x() + m_Canvas.width() < 0)
{
SetCanvasPosition(m_drawRect.width(), 0);
m_scrollPos = m_scrollPosWhole = 0;
}
}
break;
if (m_scrollPause > 0)
{
--m_scrollPause;
case ScrollRight :
if (m_Canvas.width() > m_drawRect.width())
{
ShiftCanvas(shift, 0);
if (m_Canvas.x() > m_drawRect.width())
{
SetCanvasPosition(-m_Canvas.width(), 0);
m_scrollPos = m_scrollPosWhole = 0;
}
}
break;
}
if (m_scrollBounce) // scroll right
{
if (m_Canvas.x() + m_scrollOffset > m_drawRect.x())
case ScrollHorizontal:
if (m_Canvas.width() <= m_drawRect.width())
break;
if (m_scrollBounce) // scroll right
{
m_scrollBounce = false;
m_scrollPause = ScrollBounceDelay;
if (m_Canvas.x() + m_scrollOffset > m_drawRect.x())
{
m_scrollBounce = false;
m_scrollPause = m_scrollStartDelay;
m_scrollPos = m_scrollPosWhole = 0;
}
else
ShiftCanvas(shift, 0);
}
else
ShiftCanvas(1, 0);
}
else // scroll left
{
if (m_Canvas.x() + m_Canvas.width() + m_scrollOffset <
m_drawRect.x() + m_drawRect.width())
else // scroll left
{
m_scrollBounce = true;
m_scrollPause = ScrollBounceDelay;
if (m_Canvas.x() + m_Canvas.width() + m_scrollOffset <
m_drawRect.x() + m_drawRect.width())
{
m_scrollBounce = true;
m_scrollPause = m_scrollReturnDelay;
m_scrollPos = m_scrollPosWhole = 0;
}
else
ShiftCanvas(-shift, 0);
}
else
ShiftCanvas(-1, 0);
}
break;
case ScrollUp :
if (m_Canvas.height() > m_drawRect.height())
{
ShiftCanvas(0, -1);
if (m_Canvas.y() + m_Canvas.height() < 0)
SetCanvasPosition(0, m_drawRect.height());
}
break;
case ScrollDown :
if (m_Canvas.height() > m_drawRect.height())
{
ShiftCanvas(0, 1);
if (m_Canvas.y() > m_drawRect.height())
SetCanvasPosition(0, -m_Canvas.height());
}
break;
case ScrollVertical:
if (m_Canvas.height() <= m_drawRect.height())
break;
if (m_scrollPause > 0)
{
--m_scrollPause;
case ScrollUp :
if (m_Canvas.height() > m_drawRect.height())
{
ShiftCanvas(0, -shift);
if (m_Canvas.y() + m_Canvas.height() < 0)
{
SetCanvasPosition(0, m_drawRect.height());
m_scrollPos = m_scrollPosWhole = 0;
}
}
break;
}
if (m_scrollBounce) // scroll down
{
if (m_Canvas.y() + m_scrollOffset > m_drawRect.y())
case ScrollDown :
if (m_Canvas.height() > m_drawRect.height())
{
m_scrollBounce = false;
m_scrollPause = ScrollBounceDelay;
ShiftCanvas(0, shift);
if (m_Canvas.y() > m_drawRect.height())
{
SetCanvasPosition(0, -m_Canvas.height());
m_scrollPos = m_scrollPosWhole = 0;
}
}
else
ShiftCanvas(0, 1);
}
else // scroll up
{
if (m_Canvas.y() + m_Canvas.height() + m_scrollOffset <
m_drawRect.y() + m_drawRect.height())
break;
case ScrollVertical:
if (m_Canvas.height() <= m_drawRect.height())
break;
if (m_scrollBounce) // scroll down
{
m_scrollBounce = true;
m_scrollPause = ScrollBounceDelay;
if (m_Canvas.y() + m_scrollOffset > m_drawRect.y())
{
m_scrollBounce = false;
m_scrollPause = m_scrollStartDelay;
m_scrollPos = m_scrollPosWhole = 0;
}
else
ShiftCanvas(0, shift);
}
else
ShiftCanvas(0, -1);
}
break;
case ScrollNone:
else // scroll up
{
if (m_Canvas.y() + m_Canvas.height() + m_scrollOffset <
m_drawRect.y() + m_drawRect.height())
{
m_scrollBounce = true;
m_scrollPause = m_scrollReturnDelay;
m_scrollPos = m_scrollPosWhole = 0;
}
else
ShiftCanvas(0, -shift);
}
break;
case ScrollNone:
break;
}
}
}
}
Expand Down Expand Up @@ -1316,6 +1354,47 @@ bool MythUIText::ParseElement(
}
}

tmp = element.attribute("startdelay");
if (!tmp.isEmpty())
{
float seconds = tmp.toFloat();
m_scrollStartDelay = static_cast<int>(seconds *
static_cast<float>(MythMainWindow::drawRefresh) + 0.5);
}
tmp = element.attribute("returndelay");
if (!tmp.isEmpty())
{
float seconds = tmp.toFloat();
m_scrollReturnDelay = static_cast<int>(seconds *
static_cast<float>(MythMainWindow::drawRefresh) + 0.5);
}
tmp = element.attribute("rate");
if (!tmp.isEmpty())
{
#if 0 // scroll rate as a percentage of 70Hz
float percent = tmp.toFloat() / 100.0;
m_scrollForwardRate = percent *
static_cast<float>(MythMainWindow::drawRefresh) / 70.0;
#else // scroll rate as pixels per second
int pixels = tmp.toInt();
m_scrollForwardRate =
pixels / static_cast<float>(MythMainWindow::drawRefresh);
#endif
}
tmp = element.attribute("returnrate");
if (!tmp.isEmpty())
{
#if 0 // scroll rate as a percentage of 70Hz
float percent = tmp.toFloat() / 100.0;
m_scrollReturnRate = percent *
static_cast<float>(MythMainWindow::drawRefresh) / 70.0;
#else // scroll rate as pixels per second
int pixels = tmp.toInt();
m_scrollReturnRate =
pixels / static_cast<float>(MythMainWindow::drawRefresh);
#endif
}

m_scrolling = true;
}
else
Expand Down Expand Up @@ -1404,8 +1483,12 @@ void MythUIText::CopyFrom(MythUIType *base)
incG = text->incG;
incB = text->incB;

m_scrolling = text->m_scrolling;
m_scrollStartDelay = text->m_scrollStartDelay;
m_scrollReturnDelay = text->m_scrollReturnDelay;
m_scrollForwardRate = text->m_scrollForwardRate;
m_scrollReturnRate = text->m_scrollReturnRate;
m_scrollDirection = text->m_scrollDirection;
m_scrolling = text->m_scrolling;

m_textCase = text->m_textCase;

Expand Down
18 changes: 13 additions & 5 deletions mythtv/libs/libmythui/mythuitext.h
View file
Expand Up @@ -10,6 +10,7 @@

// Mythui headers
#include "mythuitype.h"
#include "mythmainwindow.h"

class MythFontProperties;

Expand Down Expand Up @@ -135,15 +136,22 @@ class MUI_PUBLIC MythUIText : public MythUIType, public StorageUser
float curR, curG, curB;
float incR, incG, incB;

enum Constants {ScrollBounceDelay = 250};
// Default delay of 3 seconds before 'bouncing' the scrolling text
enum Constants {ScrollBounceDelay = MythMainWindow::drawRefresh * 3};
enum ScrollDir {ScrollNone, ScrollLeft, ScrollRight, ScrollUp, ScrollDown,
ScrollHorizontal, ScrollVertical};

int m_scrollPause;
int m_scrollOffset;
bool m_scrollBounce;
bool m_scrolling;
int m_scrollStartDelay;
int m_scrollReturnDelay;
int m_scrollPause;
float m_scrollForwardRate;
float m_scrollReturnRate;
bool m_scrollBounce;
int m_scrollOffset;
float m_scrollPos;
int m_scrollPosWhole;
ScrollDir m_scrollDirection;
bool m_scrolling;

enum TextCase {CaseNormal, CaseUpper, CaseLower, CaseCapitaliseFirst,
CaseCapitaliseAll};
Expand Down

0 comments on commit da78e80

Please sign in to comment.