aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-03 01:12:10 (GMT)
committerfluxgen <fluxgen>2004-01-03 01:12:10 (GMT)
commit1ac796e8e03fe406b314e36a4873cc7faf821e25 (patch)
tree8cb2c6775bef028bfed24a60dcb72436e1fd9679 /src
parent3fb05a9c781fecc1bbf520b3cbfa82de592102df (diff)
downloadfluxbox_pavel-1ac796e8e03fe406b314e36a4873cc7faf821e25.zip
fluxbox_pavel-1ac796e8e03fe406b314e36a4873cc7faf821e25.tar.bz2
check texture type too, it could be tiled
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/ImageControl.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index a09b32f..0cb7fbe 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: ImageControl.cc,v 1.9 2004/01/02 22:54:29 fluxgen Exp $ 25// $Id: ImageControl.cc,v 1.10 2004/01/03 01:12:10 fluxgen Exp $
26 26
27#include "ImageControl.hh" 27#include "ImageControl.hh"
28 28
@@ -158,7 +158,8 @@ Pixmap ImageControl::searchCache(unsigned int width, unsigned int height,
158 CacheList::iterator it_end = cache.end(); 158 CacheList::iterator it_end = cache.end();
159 for (; it != it_end; ++it) { 159 for (; it != it_end; ++it) {
160 if ((*it)->texture_pixmap == text.pixmap().drawable() && 160 if ((*it)->texture_pixmap == text.pixmap().drawable() &&
161 (*it)->width == width && (*it)->height == height) { 161 (*it)->width == width && (*it)->height == height &&
162 (*it)->texture == text.type()) {
162 (*it)->count++; 163 (*it)->count++;
163 return (*it)->pixmap; 164 return (*it)->pixmap;
164 } 165 }