aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-09-12 14:56:20 (GMT)
committerrathnor <rathnor>2004-09-12 14:56:20 (GMT)
commit42c1fd3ae3dd058e146b7350c65b74386123c25c (patch)
treecc549c2c7b12c87f8c33198f5b30f00d9dd30bc6 /src/FbTk/Menu.cc
parentc39234195a46cece2bdb18dfdde6c91c7a190dc4 (diff)
downloadfluxbox_pavel-42c1fd3ae3dd058e146b7350c65b74386123c25c.zip
fluxbox_pavel-42c1fd3ae3dd058e146b7350c65b74386123c25c.tar.bz2
preliminary support for composite/compositing manager. Also general work
for consistency with transparency resources
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r--src/FbTk/Menu.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 5cfb1d1..b1e186d 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.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: Menu.cc,v 1.84 2004/09/11 22:59:15 fluxgen Exp $ 25// $Id: Menu.cc,v 1.85 2004/09/12 14:56:19 rathnor Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -1379,10 +1379,14 @@ void Menu::keyPressEvent(XKeyEvent &event) {
1379 1379
1380void Menu::reconfigure() { 1380void Menu::reconfigure() {
1381 1381
1382 if (alpha() == 255 && m_transp.get() != 0) { 1382 if (FbTk::Transparent::haveComposite()) {
1383 if (m_transp.get() != 0)
1384 m_transp.reset(0);
1385
1386 menu.window.setOpaque(alpha());
1387 } else if (alpha() == 255 && m_transp.get() != 0) {
1383 m_transp.reset(0); 1388 m_transp.reset(0);
1384 } else if (alpha () < 255) { 1389 } else if (alpha () < 255) {
1385
1386 if (m_transp.get() == 0) { 1390 if (m_transp.get() == 0) {
1387 m_transp.reset(new Transparent(FbPixmap::getRootPixmap(screenNumber()), 1391 m_transp.reset(new Transparent(FbPixmap::getRootPixmap(screenNumber()),
1388 m_real_frame_pm.drawable(), alpha(), 1392 m_real_frame_pm.drawable(), alpha(),
@@ -1484,7 +1488,6 @@ void Menu::renderTransp(int x, int y,
1484 if (m_transp->source() != root) 1488 if (m_transp->source() != root)
1485 m_transp->setSource(root, screenNumber()); 1489 m_transp->setSource(root, screenNumber());
1486 1490
1487
1488 if (m_transp->dest() != m_real_frame_pm.drawable()) 1491 if (m_transp->dest() != m_real_frame_pm.drawable())
1489 m_transp->setDest(m_real_frame_pm.drawable(), screenNumber()); 1492 m_transp->setDest(m_real_frame_pm.drawable(), screenNumber());
1490 1493