summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-09-16 15:20:26 (GMT)
committermathias <mathias>2005-09-16 15:20:26 (GMT)
commit15c21ed267ae56087cfb1d5dd41c20012727d29d (patch)
tree7067f19c5389f10520815485841e87c820a1dd4a
parent3a0d8391f84b7c5ebc28b75ab16e1092c1d06e43 (diff)
downloadfluxbox_lack-15c21ed267ae56087cfb1d5dd41c20012727d29d.zip
fluxbox_lack-15c21ed267ae56087cfb1d5dd41c20012727d29d.tar.bz2
reverted last change .. the problem of the user must be handled differently... never commit after 3 hours of sleep again.
-rw-r--r--ChangeLog5
-rw-r--r--src/Window.cc2
2 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 60d67e7..6327e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,5 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3 * Click of LeftMouseButton should always setInputFocus (thanx Eike von Seggern)
4 solves problem with focus changes via key and then not beeing
5 able to focus the window underneath the mouse with a simple
6 click in MouseFocus mode
7 src/Window.cc
8 * Use fbsetroot in Default-Styles (Mathias) 3 * Use fbsetroot in Default-Styles (Mathias)
9 data/styles/* 4 data/styles/*
10------------------------------------------------------------- 5-------------------------------------------------------------
diff --git a/src/Window.cc b/src/Window.cc
index 9485a29..35794ef 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2647,7 +2647,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
2647 frame().buttonPressEvent(be); 2647 frame().buttonPressEvent(be);
2648 2648
2649 if (be.button == 1 || (be.button == 3 && be.state == Mod1Mask)) { 2649 if (be.button == 1 || (be.button == 3 && be.state == Mod1Mask)) {
2650 if ((! focused) ) { 2650 if ((! focused) && (! screen().isMouseFocus())) { //check focus
2651 setInputFocus(); 2651 setInputFocus();
2652 } 2652 }
2653 2653