author | alwin <alwin> | 2004-04-04 19:08:33 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-04 19:08:33 (UTC) |
commit | 10eac928ae0a1441529f7d38dd774740af477481 (patch) (side-by-side diff) | |
tree | 18684ff7f6a8b15f936ee4428ea58b1f164dd477 | |
parent | 4588425855268ce88a80ddbac7e1c3d4b87b03f4 (diff) | |
download | opie-10eac928ae0a1441529f7d38dd774740af477481.zip opie-10eac928ae0a1441529f7d38dd774740af477481.tar.gz opie-10eac928ae0a1441529f7d38dd774740af477481.tar.bz2 |
thumbnails will respect again the dimension values wished. just when them
seems to be nonsens we will use hard wired 64x64 pix
-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp index 82b3d23..fb88873 100644 --- a/noncore/graphics/opie-eye/slave/slavereciever.cpp +++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp @@ -164,50 +164,56 @@ void SlaveReciever::slotImageInfo() { inf.info = (*it)->fullImageInfo( inf.file ); else inf.info = (*it)->iconViewName( inf.file ); m_outList.append( inf ); break; } } if (m_inList.isEmpty() ) m_inf->stop(); if (!m_out->isActive() && !m_outList.isEmpty() ) m_out->start( 100 ); } void SlaveReciever::slotThumbNail() { PixmapInfo inf = m_inPix.first(); m_inPix.remove( inf ); static SlaveObjects::Iterator it; static SlaveObjects* map = slaveObjects(); // SlaveMap won't be changed during execution!!! for(it = map->begin(); it != map->end(); ++it ) { SlaveInterface* iface = it.data(); if( iface->supports(inf.file ) ) { /* pixmap */ - owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; - inf.pixmap = iface->pixmap(inf.file, 64, 64); + owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; + if (inf.width>256||inf.height>256) { + owarn << "Scaling thumbnail to 64x64 'cause " << inf.width<<"x"<<inf.height<< + " may be nonsense"; + inf.pixmap = iface->pixmap(inf.file, 64, 64); + }else { + inf.pixmap = iface->pixmap(inf.file, inf.width, inf.height); + } m_outPix.append( inf ); break; } } if(m_inPix.isEmpty() ) m_pix->stop(); if(!m_out->isActive() && !m_outPix.isEmpty() ) m_out->start(100); } void SlaveReciever::slotSend() { m_out->stop(); owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; /* queue it and send */ /* if this ever gets a service introduce request queues * so we can differinatate between different clients */ if (! m_outPix.isEmpty() ) { QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" ); |