diff options
author | fluxgen <fluxgen> | 2002-11-14 11:38:38 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-11-14 11:38:38 (GMT) |
commit | ff8702a3f371a581dd4900345ef836ee7853332a (patch) | |
tree | 8be22ad3123a6d04dcd9e518cc4913bac733835d /src | |
parent | d68f996683d28a287ad439acdf0713c4828afea3 (diff) | |
download | fluxbox_lack-ff8702a3f371a581dd4900345ef836ee7853332a.zip fluxbox_lack-ff8702a3f371a581dd4900345ef836ee7853332a.tar.bz2 |
fixed bug 581588, toolbar auto hiding while editing workspace name
Diffstat (limited to 'src')
-rw-r--r-- | src/Toolbar.cc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index e4d6b1d..7428274 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.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: Toolbar.cc,v 1.37 2002/10/29 16:09:37 fluxgen Exp $ | 25 | // $Id: Toolbar.cc,v 1.38 2002/11/14 11:38:38 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Toolbar.hh" | 27 | #include "Toolbar.hh" |
28 | 28 | ||
@@ -1106,13 +1106,21 @@ void Toolbar::timeout() { | |||
1106 | 1106 | ||
1107 | 1107 | ||
1108 | void Toolbar::HideHandler::timeout() { | 1108 | void Toolbar::HideHandler::timeout() { |
1109 | if (toolbar->isEditing()) { // don't hide if we're editing workspace label | ||
1110 | toolbar->hide_timer.fireOnce(false); | ||
1111 | toolbar->hide_timer.start(); // restart timer and try next timeout | ||
1112 | return; | ||
1113 | } | ||
1114 | toolbar->hide_timer.fireOnce(true); | ||
1115 | |||
1109 | toolbar->hidden = ! toolbar->hidden; | 1116 | toolbar->hidden = ! toolbar->hidden; |
1110 | if (toolbar->hidden) | 1117 | if (toolbar->hidden) { |
1111 | XMoveWindow(toolbar->display, toolbar->frame.window, | 1118 | XMoveWindow(toolbar->display, toolbar->frame.window, |
1112 | toolbar->frame.x_hidden, toolbar->frame.y_hidden); | 1119 | toolbar->frame.x_hidden, toolbar->frame.y_hidden); |
1113 | else | 1120 | } else { |
1114 | XMoveWindow(toolbar->display, toolbar->frame.window, | 1121 | XMoveWindow(toolbar->display, toolbar->frame.window, |
1115 | toolbar->frame.x, toolbar->frame.y); | 1122 | toolbar->frame.x, toolbar->frame.y); |
1123 | } | ||
1116 | } | 1124 | } |
1117 | 1125 | ||
1118 | 1126 | ||