diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index 84b28ad0..3579057f 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -67,5 +67,6 @@ ../images/glowLine.png ../images/clearSearch.png ../images/iconSearch.png + ../images/readRibbon.png \ No newline at end of file diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index e47ded10..977404cd 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -130,7 +130,7 @@ void LibraryWindow::doLayout() m.scale(-1,1); QImage image(":/images/setRead.png"); QImage imageTransformed = image.transformed(m,Qt::SmoothTransformation); - comicFlow->setMarkImage(imageTransformed); + comicFlow->setMarkImage(imageTransformed); //not used in flowGL... int heightDesktopResolution = QApplication::desktop()->screenGeometry().height(); int height,width; height = heightDesktopResolution*0.39; diff --git a/common/yacreader_flow_gl.cpp b/common/yacreader_flow_gl.cpp index 44302e34..39cc7fac 100644 --- a/common/yacreader_flow_gl.cpp +++ b/common/yacreader_flow_gl.cpp @@ -279,7 +279,7 @@ void YACReaderFlowGL::initializeGL() glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); defaultTexture = bindTexture(QImage(":/images/defaultCover.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption); - markTexture = bindTexture(QImage(":/images/setRead.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption); + markTexture = bindTexture(QImage(":/images/readRibbon.png"),GL_TEXTURE_2D,GL_RGBA,QGLContext::LinearFilteringBindOption | QGLContext::MipmapBindOption); if(lazyPopulateObjects!=-1) populate(lazyPopulateObjects); @@ -461,24 +461,24 @@ void YACReaderFlowGL::drawCover(CFImage *CF) glBegin(GL_QUADS); //esquina inferior izquierda - glColor4f(LDOWN*opacity,LDOWN*opacity,LDOWN*opacity,1); + glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); glTexCoord2f(0.0f, 1.0f); - glVertex3f(w/2.f-0.2f, -0.5f, 0.001f); + glVertex3f(w/2.f-0.2, -0.685f+h, 0.001f); //esquina inferior derecha - glColor4f(RDOWN*opacity,RDOWN*opacity,RDOWN*opacity,1); + glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); glTexCoord2f(1.0f, 1.0f); - glVertex3f(w/2.f, -0.5f, 0.001f); + glVertex3f(w/2.f-0.05, -0.685f+h, 0.001f); //esquina superior derecha glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); glTexCoord2f(1.0f, 0.0f); - glVertex3f(w/2.f, -0.3f, 0.001f); + glVertex3f(w/2.f-0.05, -0.485f+h, 0.001f); //esquina superior izquierda - glColor4f(LUP*opacity,LUP*opacity,LUP*opacity,1); + glColor4f(RUP*opacity,RUP*opacity,RUP*opacity,1); glTexCoord2f(0.0f, 0.0f); - glVertex3f(w/2.f-0.2f, -0.3f, 0.001f); + glVertex3f(w/2.f-0.2, -0.485f+h, 0.001f); glEnd(); glDisable(GL_TEXTURE_2D); diff --git a/images/readRibbon.png b/images/readRibbon.png new file mode 100644 index 00000000..f1a862c0 Binary files /dev/null and b/images/readRibbon.png differ