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/Screen.cc | |
parent | d2959aeb6b86b4a43168a9f9fbd123a68c1f821e (diff) | |
download | fluxbox-c5b79ed14b350130226a5f978edc8c55caa190a3.zip fluxbox-c5b79ed14b350130226a5f978edc8c55caa190a3.tar.bz2 |
usePixmap from Texture
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 4a4141e..7ac60d6 100644 --- a/src/Screen.cc +++ b/src/Screen.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: Screen.cc,v 1.244 2003/12/04 21:31:02 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.245 2003/12/07 16:39:43 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -2160,8 +2160,7 @@ void BScreen::renderGeomWindow() { | |||
2160 | Pixmap tmp = geom_pixmap; | 2160 | Pixmap tmp = geom_pixmap; |
2161 | 2161 | ||
2162 | if (winFrameTheme().labelFocusTexture().type() & FbTk::Texture::PARENTRELATIVE) { | 2162 | if (winFrameTheme().labelFocusTexture().type() & FbTk::Texture::PARENTRELATIVE) { |
2163 | if (winFrameTheme().titleFocusTexture().type() == | 2163 | if (!winFrameTheme().titleFocusTexture().usePixmap()) { |
2164 | (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | ||
2165 | geom_pixmap = None; | 2164 | geom_pixmap = None; |
2166 | m_geom_window.setBackgroundColor(winFrameTheme().titleFocusTexture().color()); | 2165 | m_geom_window.setBackgroundColor(winFrameTheme().titleFocusTexture().color()); |
2167 | } else { | 2166 | } else { |
@@ -2170,8 +2169,7 @@ void BScreen::renderGeomWindow() { | |||
2170 | m_geom_window.setBackgroundPixmap(geom_pixmap); | 2169 | m_geom_window.setBackgroundPixmap(geom_pixmap); |
2171 | } | 2170 | } |
2172 | } else { | 2171 | } else { |
2173 | if (winFrameTheme().labelFocusTexture().type() == | 2172 | if (!winFrameTheme().labelFocusTexture().usePixmap()) { |
2174 | (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | ||
2175 | geom_pixmap = None; | 2173 | geom_pixmap = None; |
2176 | m_geom_window.setBackgroundColor(winFrameTheme().labelFocusTexture().color()); | 2174 | m_geom_window.setBackgroundColor(winFrameTheme().labelFocusTexture().color()); |
2177 | } else { | 2175 | } else { |