aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-07 16:39:43 (GMT)
committerfluxgen <fluxgen>2003-12-07 16:39:43 (GMT)
commitc5b79ed14b350130226a5f978edc8c55caa190a3 (patch)
tree9d79b213de852728d54ea21671d22e681ee18670 /src/IconbarTool.cc
parentd2959aeb6b86b4a43168a9f9fbd123a68c1f821e (diff)
downloadfluxbox-c5b79ed14b350130226a5f978edc8c55caa190a3.zip
fluxbox-c5b79ed14b350130226a5f978edc8c55caa190a3.tar.bz2
usePixmap from Texture
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 80dc5fd..6f5356c 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconbarTool.cc,v 1.18 2003/12/03 00:16:56 fluxgen Exp $ 23// $Id: IconbarTool.cc,v 1.19 2003/12/07 16:39:43 fluxgen Exp $
24 24
25#include "IconbarTool.hh" 25#include "IconbarTool.hh"
26 26
@@ -416,7 +416,7 @@ void IconbarTool::renderWindow(FluxboxWindow &win) {
416 416
417void IconbarTool::renderTheme() { 417void IconbarTool::renderTheme() {
418 Pixmap tmp = m_focused_pm; 418 Pixmap tmp = m_focused_pm;
419 if (m_theme.focusedTexture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 419 if (!m_theme.focusedTexture().usePixmap()) {
420 m_focused_pm = 0; 420 m_focused_pm = 0;
421 } else { 421 } else {
422 m_focused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(), 422 m_focused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(),
@@ -428,7 +428,7 @@ void IconbarTool::renderTheme() {
428 m_screen.imageControl().removeImage(tmp); 428 m_screen.imageControl().removeImage(tmp);
429 429
430 tmp = m_unfocused_pm; 430 tmp = m_unfocused_pm;
431 if (m_theme.unfocusedTexture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 431 if (!m_theme.unfocusedTexture().usePixmap()) {
432 m_unfocused_pm = 0; 432 m_unfocused_pm = 0;
433 } else { 433 } else {
434 m_unfocused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(), 434 m_unfocused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(),
@@ -440,7 +440,7 @@ void IconbarTool::renderTheme() {
440 440
441 // if we dont have any icons then we should render empty texture 441 // if we dont have any icons then we should render empty texture
442 tmp = m_empty_pm; 442 tmp = m_empty_pm;
443 if (m_theme.emptyTexture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 443 if (!m_theme.emptyTexture().usePixmap()) {
444 m_empty_pm = 0; 444 m_empty_pm = 0;
445 m_icon_container.setBackgroundColor(m_theme.emptyTexture().color()); 445 m_icon_container.setBackgroundColor(m_theme.emptyTexture().color());
446 } else { 446 } else {