mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

solucionados algunos problemas en la integraci?n de yacreader_flow_gl (comicFlow)

Browse Source
This commit is contained in:
Luis Ángel San Martín 2012-10-02 19:33:04 +02:00
parent 4e43e66df3
commit 98e5fc648c
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
YACReaderLibrary/library_window.cpp
View File

@ -52,6 +52,7 @@ void LibraryWindow::doLayout()
//TODO: flowType is a global variable //TODO: flowType is a global variable
//CONFIG COMIC_FLOW-------------------------------------------------------- //CONFIG COMIC_FLOW--------------------------------------------------------
comicFlow = new ComicFlowWidgetGL(0); comicFlow = new ComicFlowWidgetGL(0);
comicFlow->setFlowType(flowType);
comicFlow->setFocusPolicy(Qt::StrongFocus); comicFlow->setFocusPolicy(Qt::StrongFocus);
comicFlow->setShowMarks(true); comicFlow->setShowMarks(true);
QMatrix m; QMatrix m;

9
common/comic_flow_widget.cpp
View File

@ -200,7 +200,14 @@ void ComicFlowWidgetGL::updateMarks()
} }
void ComicFlowWidgetGL::setFlowType(PictureFlow::FlowType flowType) void ComicFlowWidgetGL::setFlowType(PictureFlow::FlowType flowType)
{ {
flow->setFlowType(flowType); if(flowType == PictureFlow::CoverFlowLike)
flow->setPreset(presetYACReaderFlowClassicConfig);
else if(flowType == PictureFlow::Strip)
flow->setPreset(presetYACReaderFlowStripeConfig);
else if(flowType == PictureFlow::StripOverlapped)
flow->setPreset(presetYACReaderFlowOverlappedStripeConfig);
else
flow->setPreset(defaultYACReaderFlowConfig);
} }
void ComicFlowWidgetGL::render() void ComicFlowWidgetGL::render()
{ {

10
common/yacreader_flow_gl.cpp
View File

@ -437,7 +437,7 @@ void YACReaderFlowGL::drawCover(CFImage *CF)
glEnd(); glEnd();
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
if(loaded[CF->index] && marks[CF->index]) if(showMarks && loaded[CF->index] && marks[CF->index])
{ {
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, markTexture); glBindTexture(GL_TEXTURE_2D, markTexture);
@ -898,10 +898,10 @@ void YACReaderFlowGL::updateMarks()
{ {
//do nothing //do nothing
} }
void YACReaderFlowGL::setFlowType(PictureFlow::FlowType flowType) /*void YACReaderFlowGL::setFlowType(PictureFlow::FlowType flowType)
{ {
//TODO esperar a que se reimplemente flowtype //TODO esperar a que se reimplemente flowtype
} }*/
void YACReaderFlowGL::render() void YACReaderFlowGL::render()
{ {
//do nothing //do nothing
@ -965,7 +965,7 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ); gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ);
if(posX >= 0) if(posX >= 0.5)
{ {
//int index = currentSelected+1; //int index = currentSelected+1;
//while((cfImages[index].current.x-cfImages[index].width/(2.0*config.rotation)) < posX) //while((cfImages[index].current.x-cfImages[index].width/(2.0*config.rotation)) < posX)
@ -973,7 +973,7 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
//setCurrentIndex(index-1); //setCurrentIndex(index-1);
showNext(); showNext();
} }
else else if(posX <=-0.5)
showPrevious(); showPrevious();
} else if(event->button() == Qt::RightButton) } else if(event->button() == Qt::RightButton)
{ {

2
common/yacreader_flow_gl.h
View File

@ -228,7 +228,7 @@ public:
void showSlide(int index); void showSlide(int index);
int centerIndex(); int centerIndex();
void updateMarks(); void updateMarks();
void setFlowType(PictureFlow::FlowType flowType); //void setFlowType(PictureFlow::FlowType flowType);
void render(); void render();
//void paintEvent(QPaintEvent *event); //void paintEvent(QPaintEvent *event);