Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 00:15:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved AboutWidget a little bit

Browse source
This commit is contained in:
csoler 2017-01-26 09:19:18 +01:00
parent 1cd64ce0fd
commit 883c4cc8a0
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/AboutWidget.cpp
View file

@ -186,7 +186,7 @@ void AWidget::switchState()
if(mState == 1) if(mState == 1)
{ {
mStep = 1 ; mStep = 1.0f ;
initGoL(); initGoL();
drawBitField(); drawBitField();
@ -237,7 +237,6 @@ void AWidget::initImages()
image2 = image1 ; image2 = image1 ;
mImagesReady = true ; mImagesReady = true ;
initGoL();
drawBitField(); drawBitField();
update() ; update() ;
@ -258,7 +257,7 @@ void AWidget::initGoL()
for(int i=0;i<bw;++i) for(int i=0;i<bw;++i)
for(int j=0;j<bh;++j) for(int j=0;j<bh;++j)
if((image1.pixel((i+0.5)*s,(j+0.5)*s) & 0xff) < 20) if((image1.pixel((i+0.0)*s,(j+0.0)*s) & 0xff) < 0x80)
bitfield1[i+bw*j] = 1 ; bitfield1[i+bw*j] = 1 ;
} }
@ -290,7 +289,10 @@ void AWidget::drawBitField()
for(int i=0;i<bw;++i) for(int i=0;i<bw;++i)
for(int j=0;j<bh;++j) for(int j=0;j<bh;++j)
if(bitfield1[i+bw*j] == 1) if(bitfield1[i+bw*j] == 1)
if(mStep >= mMaxStep)
p.fillRect(QRect(i*s+1,j*s+1,s-2,s-2),QBrush(QColor(50,50,50))); p.fillRect(QRect(i*s+1,j*s+1,s-2,s-2),QBrush(QColor(50,50,50)));
else
p.fillRect(QRect(i*s,j*s,s,s),QBrush(QColor(50,50,50)));
p.end(); p.end();
} }
@ -301,7 +303,7 @@ AWidget::AWidget() {
density = 5; density = 5;
page = 0; page = 0;
mMaxStep = QFontMetricsF(font()).width(' ') ; mMaxStep = QFontMetricsF(font()).width(' ') ;
mStep = 1 ; mStep = 1.0f ;
mState = 0 ; mState = 0 ;
mImagesReady = false ; mImagesReady = false ;
@ -353,7 +355,7 @@ void AWidget::timerEvent(QTimerEvent* e)
else else
{ {
initGoL(); initGoL();
mStep++ ; mStep+=0.2f ;
} }
drawBitField(); drawBitField();
@ -381,12 +383,13 @@ void AWidget::paintEvent(QPaintEvent* e)
{ {
QWidget::paintEvent(e); QWidget::paintEvent(e);
if(!mImagesReady) initImages();
switch(mState) switch(mState)
{ {
default: default:
case 0: case 0:
{ {
if(!mImagesReady) initImages();
QPainter p(this); QPainter p(this);
p.drawImage(0, 0, image1); p.drawImage(0, 0, image1);
} }

2
retroshare-gui/src/gui/AboutWidget.h
View file

@ -114,7 +114,7 @@ private:
bool mImagesReady ; bool mImagesReady ;
int mState; int mState;
int mTimerId; int mTimerId;
int mStep; float mStep;
int mMaxStep; int mMaxStep;
}; };