nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor stuff

Browse source
This commit is contained in:
fluxgen 2004-01-02 22:01:08 +00:00
parent baa6a4a42f
commit b9049cefad
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/FbTk/Image.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Image.cc,v 1.3 2003/12/16 17:06:51 fluxgen Exp $ // $Id: Image.cc,v 1.4 2004/01/02 22:01:08 fluxgen Exp $
#include "Image.hh" #include "Image.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
@ -65,14 +65,16 @@ PixmapWithMask *Image::load(const std::string &filename, int screen_num) {
if (pm == 0 && s_search_paths.size()) { if (pm == 0 && s_search_paths.size()) {
// first we need to get basename of current filename // first we need to get basename of current filename
std::string base_filename = StringUtil::basename(filename); std::string base_filename = StringUtil::basename(filename);
std::string path = "";
// append each search path and try to load // append each search path and try to load
StringList::iterator it = s_search_paths.begin(); StringList::iterator it = s_search_paths.begin();
StringList::iterator it_end = s_search_paths.end(); StringList::iterator it_end = s_search_paths.end();
for (; it != it_end && pm == 0; ++it) { for (; it != it_end && pm == 0; ++it) {
// append search path and try load it // append search path and try load it
std::string path = StringUtil::expandFilename(*it); path = StringUtil::expandFilename(*it);
pm = s_image_map[extension]->load(path + "/" + base_filename, screen_num); pm = s_image_map[extension]->load(path + "/" + base_filename, screen_num);
} }
} }
return pm; return pm;