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

expand pixmap filename before loading, patch from Mathias Gumz

Browse source
This commit is contained in:
fluxgen 2004-08-03 21:31:31 +00:00
parent 7b4d57f275
commit cd0cdb5301
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/FbTk/MenuItem.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: MenuItem.cc,v 1.4 2004/07/05 09:40:08 fluxgen Exp $ // $Id: MenuItem.cc,v 1.5 2004/08/03 21:31:31 fluxgen Exp $
#include "MenuItem.hh" #include "MenuItem.hh"
#include "Command.hh" #include "Command.hh"
@ -28,6 +28,7 @@
#include "PixmapWithMask.hh" #include "PixmapWithMask.hh"
#include "Image.hh" #include "Image.hh"
#include "App.hh" #include "App.hh"
#include "StringUtil.hh"
namespace FbTk { namespace FbTk {
@ -230,8 +231,9 @@ void MenuItem::setIcon(const std::string &filename, int screen_num) {
if (m_icon.get() == 0) if (m_icon.get() == 0)
m_icon.reset(new Icon); m_icon.reset(new Icon);
m_icon->filename = filename; m_icon->filename = FbTk::StringUtil::expandFilename(filename);
m_icon->pixmap.reset(Image::load(filename.c_str(), screen_num)); m_icon->pixmap.reset(Image::load(m_icon->filename.c_str(),
screen_num));
} }
unsigned int MenuItem::height(const MenuTheme &theme) const { unsigned int MenuItem::height(const MenuTheme &theme) const {