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/FbWinFrame.cc | |
parent | d2959aeb6b86b4a43168a9f9fbd123a68c1f821e (diff) | |
download | fluxbox-c5b79ed14b350130226a5f978edc8c55caa190a3.zip fluxbox-c5b79ed14b350130226a5f978edc8c55caa190a3.tar.bz2 |
usePixmap from Texture
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r-- | src/FbWinFrame.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 1e3cb97..2ff7203 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbWinFrame.cc,v 1.62 2003/10/31 10:37:09 rathnor Exp $ | 22 | // $Id: FbWinFrame.cc,v 1.63 2003/12/07 16:39:43 fluxgen Exp $ |
23 | 23 | ||
24 | #include "FbWinFrame.hh" | 24 | #include "FbWinFrame.hh" |
25 | 25 | ||
@@ -1024,7 +1024,7 @@ void FbWinFrame::render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm, | |||
1024 | unsigned int w, unsigned int h) { | 1024 | unsigned int w, unsigned int h) { |
1025 | 1025 | ||
1026 | Pixmap tmp = pm; | 1026 | Pixmap tmp = pm; |
1027 | if (tex.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | 1027 | if (!tex.usePixmap()) { |
1028 | pm = None; | 1028 | pm = None; |
1029 | col = tex.color(); | 1029 | col = tex.color(); |
1030 | } else | 1030 | } else |