Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Slightly different approach to move the disque.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-03-29 03:06:26 +01:00
parent 62d8bd9376
commit 6ba1f0e5d1
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7 #define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 10 #define VER_LAMEXP_PATCH 10
#define VER_LAMEXP_BUILD 1259 #define VER_LAMEXP_BUILD 1260
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

47
src/Dialog_About.cpp
View File

@ -53,7 +53,7 @@
#define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(URL).replace("-", "&minus;")) #define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(QString(URL).replace("-", "&minus;"))
#define TRIM_RIGHT(STR) do { while(STR.endsWith(QChar(' ')) || STR.endsWith(QChar('\t')) || STR.endsWith(QChar('\r')) || STR.endsWith(QChar('\n'))) STR.chop(1); } while(0) #define TRIM_RIGHT(STR) do { while(STR.endsWith(QChar(' ')) || STR.endsWith(QChar('\t')) || STR.endsWith(QChar('\r')) || STR.endsWith(QChar('\n'))) STR.chop(1); } while(0)
#define MAKE_TRANSPARENT(WIDGET) do { QPalette _p = (WIDGET)->palette(); _p.setColor(QPalette::Background, Qt::transparent); (WIDGET)->setPalette(_p); } while(0) #define MAKE_TRANSPARENT(WIDGET) do { QPalette _p = (WIDGET)->palette(); _p.setColor(QPalette::Background, Qt::transparent); (WIDGET)->setPalette(_p); } while(0)
#define FLIP(X) do { (X) = (!(X)); } while (0)
//Constants //Constants
const char *AboutDialog::neroAacUrl = "http://www.nero.com/eng/technologies-aac-codec.html"; const char *AboutDialog::neroAacUrl = "http://www.nero.com/eng/technologies-aac-codec.html";
@ -339,36 +339,15 @@ void AboutDialog::moveDisque(void)
const int minY = screenGeometry.top(); const int minY = screenGeometry.top();
const int maxY = screenGeometry.height() - m_disque->height() + screenGeometry.top(); const int maxY = screenGeometry.height() - m_disque->height() + screenGeometry.top();
QPoint pos = m_disque->pos(); const QPoint posOld = m_disque->pos();
pos.setX(m_disqueFlags[0] ? pos.x() + delta : pos.x() - delta); const int x = qBound(minX, m_disqueFlags[0] ? posOld.x() + delta : posOld.x() - delta, maxX);
pos.setY(m_disqueFlags[1] ? pos.y() + delta : pos.y() - delta); const int y = qBound(minY, m_disqueFlags[1] ? posOld.y() + delta : posOld.y() - delta, maxY);
if(pos.x() <= minX) m_disque->move(x, y);
{
m_disqueFlags[0] = true;
pos.setX(minX);
m_rotateNext = true;
}
else if(pos.x() >= maxX)
{
m_disqueFlags[0] = false;
pos.setX(maxX);
m_rotateNext = true;
}
if(pos.y() <= minY)
{
m_disqueFlags[1] = true;
pos.setY(minY);
m_rotateNext = true;
}
else if(pos.y() >= maxY)
{
m_disqueFlags[1] = false;
pos.setY(maxY);
m_rotateNext = true;
}
m_disque->move(pos); const QPoint posNew = m_disque->pos();
if(posNew.x() == posOld.x()) { FLIP(m_disqueFlags[0]); m_rotateNext = true; }
if(posNew.y() == posOld.y()) { FLIP(m_disqueFlags[1]); m_rotateNext = true; }
if(m_rotateNext) if(m_rotateNext)
{ {
@ -385,9 +364,15 @@ void AboutDialog::moveDisque(void)
m_rotateNext = false; m_rotateNext = false;
} }
if(m_disque->windowOpacity() < 0.9) double opacity = m_disque->windowOpacity();
if(opacity != 1.0)
{ {
m_disque->setWindowOpacity(m_disque->windowOpacity() + 0.01); opacity = opacity + 0.01;
if(qFuzzyCompare(opacity, 1.0) || (opacity > 1.0))
{
opacity = 1.0;
}
m_disque->setWindowOpacity(opacity);
} }
} }
} }