diff options
author | fluxgen <fluxgen> | 2003-12-07 16:39:43 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-07 16:39:43 (GMT) |
commit | c5b79ed14b350130226a5f978edc8c55caa190a3 (patch) | |
tree | 9d79b213de852728d54ea21671d22e681ee18670 /src/Slit.cc | |
parent | d2959aeb6b86b4a43168a9f9fbd123a68c1f821e (diff) | |
download | fluxbox_pavel-c5b79ed14b350130226a5f978edc8c55caa190a3.zip fluxbox_pavel-c5b79ed14b350130226a5f978edc8c55caa190a3.tar.bz2 |
usePixmap from Texture
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index 422d0e4..6d037d6 100644 --- a/src/Slit.cc +++ b/src/Slit.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: Slit.cc,v 1.81 2003/11/01 00:12:53 rathnor Exp $ | 25 | // $Id: Slit.cc,v 1.82 2003/12/07 16:39:43 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Slit.hh" | 27 | #include "Slit.hh" |
28 | 28 | ||
@@ -708,9 +708,8 @@ void Slit::reconfigure() { | |||
708 | Pixmap tmp = frame.pixmap; | 708 | Pixmap tmp = frame.pixmap; |
709 | FbTk::ImageControl &image_ctrl = screen().imageControl(); | 709 | FbTk::ImageControl &image_ctrl = screen().imageControl(); |
710 | const FbTk::Texture &texture = m_slit_theme->texture(); | 710 | const FbTk::Texture &texture = m_slit_theme->texture(); |
711 | if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID) && | 711 | if (!texture.usePixmap()) { |
712 | texture.pixmap().drawable() == 0) { | 712 | frame.pixmap = 0; |
713 | frame.pixmap = None; | ||
714 | frame.window.setBackgroundColor(texture.color()); | 713 | frame.window.setBackgroundColor(texture.color()); |
715 | } else { | 714 | } else { |
716 | frame.pixmap = image_ctrl.renderImage(frame.width, frame.height, | 715 | frame.pixmap = image_ctrl.renderImage(frame.width, frame.height, |