diff options
author | rathnor <rathnor> | 2004-05-24 13:09:32 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-05-24 13:09:32 (GMT) |
commit | ca307efe3e719fbc3917ae54af4e2243ae0e4044 (patch) | |
tree | 2e4de8186dc19584e830eb80dc53336cd9a7a4be | |
parent | 0cab1dfb3dbe5938f8b9d1b0050cbd9348c4e715 (diff) | |
download | fluxbox-ca307efe3e719fbc3917ae54af4e2243ae0e4044.zip fluxbox-ca307efe3e719fbc3917ae54af4e2243ae0e4044.tar.bz2 |
handling of alpha = 0
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/FbTk/FbWindow.cc | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -1,5 +1,8 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.10: | 2 | Changes for 0.9.10: |
3 | *04/05/24: | ||
4 | * Fix handling alpha value of zero (Simon) | ||
5 | FbWindow.cc | ||
3 | *04/05/21: | 6 | *04/05/21: |
4 | * fluxbox-generate_menu: | 7 | * fluxbox-generate_menu: |
5 | Updated polish locales from: Łukasz Wrzosek (unl at poczta dot fm) | 8 | Updated polish locales from: Łukasz Wrzosek (unl at poczta dot fm) |
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 5ebd9f2..e7649d7 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.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: FbWindow.cc,v 1.33 2004/05/17 15:01:32 rathnor Exp $ | 22 | // $Id: FbWindow.cc,v 1.34 2004/05/24 13:09:32 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbWindow.hh" | 24 | #include "FbWindow.hh" |
25 | 25 | ||
@@ -240,11 +240,11 @@ void FbWindow::updateTransparent(int the_x, int the_y, unsigned int the_width, u | |||
240 | 240 | ||
241 | void FbWindow::setAlpha(unsigned char alpha) { | 241 | void FbWindow::setAlpha(unsigned char alpha) { |
242 | #ifdef HAVE_XRENDER | 242 | #ifdef HAVE_XRENDER |
243 | if (m_transparent.get() == 0 && alpha != 0) { | 243 | if (m_transparent.get() == 0 && alpha < 255) { |
244 | m_transparent.reset(new Transparent(getRootPixmap(screenNumber()), window(), alpha, screenNumber())); | 244 | m_transparent.reset(new Transparent(getRootPixmap(screenNumber()), window(), alpha, screenNumber())); |
245 | } else if (alpha != 0 && alpha != m_transparent->alpha()) | 245 | } else if (alpha < 255 && alpha != m_transparent->alpha()) |
246 | m_transparent->setAlpha(alpha); | 246 | m_transparent->setAlpha(alpha); |
247 | else if (alpha == 0) | 247 | else if (alpha == 255) |
248 | m_transparent.reset(0); // destroy transparent object | 248 | m_transparent.reset(0); // destroy transparent object |
249 | #endif // HAVE_XRENDER | 249 | #endif // HAVE_XRENDER |
250 | } | 250 | } |