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

Updated texture constants

Browse source
This commit is contained in:
fluxgen 2001-12-29 10:39:04 +00:00
parent ccd408d988
commit a75bfa59d2
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/IconBar.cc
View file

@ -22,11 +22,10 @@
#include "IconBar.hh" #include "IconBar.hh"
#include "i18n.hh" #include "i18n.hh"
IconBarObj::IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin): IconBarObj::IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin)
m_fluxboxwin(fluxboxwin),
m_iconwin(iconwin)
{ {
m_fluxboxwin = fluxboxwin;
m_iconwin = iconwin;
} }
IconBarObj::~IconBarObj() { IconBarObj::~IconBarObj() {
@ -93,10 +92,10 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) {
Pixmap tmp = m_focus_pm; Pixmap tmp = m_focus_pm;
BTexture *texture = &(m_screen->getWindowStyle()->tab.l_focus); BTexture *texture = &(m_screen->getWindowStyle()->tab.l_focus);
if (texture->getTexture() & BImage_ParentRelative ) { if (texture->getTexture() & BImage::PARENTRELATIVE ) {
BTexture *pt = &(m_screen->getWindowStyle()->tab.t_focus); BTexture *pt = &(m_screen->getWindowStyle()->tab.t_focus);
if (pt->getTexture() == (BImage_Flat | BImage_Solid)) { if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
m_focus_pm = None; m_focus_pm = None;
m_focus_pixel = pt->getColor()->getPixel(); m_focus_pixel = pt->getColor()->getPixel();
} else } else
@ -105,7 +104,7 @@ void IconBar::loadTheme(unsigned int width, unsigned int height) {
} else { } else {
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
m_focus_pm = None; m_focus_pm = None;
m_focus_pixel = texture->getColor()->getPixel(); m_focus_pixel = texture->getColor()->getPixel();
} else } else