diff options
author | fluxgen <fluxgen> | 2004-03-31 10:28:08 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-03-31 10:28:08 (GMT) |
commit | 674bc079487048ad8d28704c6e951605e07bb371 (patch) | |
tree | 48b583e282d824c182830fc5a0c50c18c86235e1 | |
parent | 42857269561d60d8e72460846a19a722c919a919 (diff) | |
download | fluxbox_paul-674bc079487048ad8d28704c6e951605e07bb371.zip fluxbox_paul-674bc079487048ad8d28704c6e951605e07bb371.tar.bz2 |
fixed decoration bug with MOTIF_WM_HINTS
-rw-r--r-- | src/Window.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Window.cc b/src/Window.cc index 6ef1532..2324e78 100644 --- a/src/Window.cc +++ b/src/Window.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: Window.cc,v 1.274 2004/03/30 14:31:30 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.275 2004/03/31 10:28:08 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -1045,11 +1045,10 @@ void FluxboxWindow::updateMWMHintsFromClient(WinClient &client) { | |||
1045 | decorations.border = true; | 1045 | decorations.border = true; |
1046 | if (hint->decorations & MwmDecorHandle) | 1046 | if (hint->decorations & MwmDecorHandle) |
1047 | decorations.handle = true; | 1047 | decorations.handle = true; |
1048 | if (hint->decorations & MwmDecorTitle) { | 1048 | if (hint->decorations & MwmDecorTitle) { |
1049 | //only tab on windows with titlebar | 1049 | //only tab on windows with titlebar |
1050 | decorations.titlebar = decorations.tab = true; | 1050 | decorations.titlebar = decorations.tab = true; |
1051 | } | 1051 | } |
1052 | |||
1053 | if (hint->decorations & MwmDecorMenu) | 1052 | if (hint->decorations & MwmDecorMenu) |
1054 | decorations.menu = true; | 1053 | decorations.menu = true; |
1055 | if (hint->decorations & MwmDecorIconify) | 1054 | if (hint->decorations & MwmDecorIconify) |
@@ -2241,6 +2240,7 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) { | |||
2241 | } else if (atom == fbatoms->getMWMHintsAtom()) { | 2240 | } else if (atom == fbatoms->getMWMHintsAtom()) { |
2242 | client.updateMWMHints(); | 2241 | client.updateMWMHints(); |
2243 | updateMWMHintsFromClient(client); | 2242 | updateMWMHintsFromClient(client); |
2243 | applyDecorations(); // update decorations (if they changed) | ||
2244 | } else if (atom == fbatoms->getFluxboxHintsAtom()) { | 2244 | } else if (atom == fbatoms->getFluxboxHintsAtom()) { |
2245 | client.updateBlackboxHints(); | 2245 | client.updateBlackboxHints(); |
2246 | updateBlackboxHintsFromClient(client); | 2246 | updateBlackboxHintsFromClient(client); |
@@ -3115,8 +3115,6 @@ void FluxboxWindow::restore(WinClient *client, bool remap) { | |||
3115 | #ifdef DEBUG | 3115 | #ifdef DEBUG |
3116 | cerr<<"FluxboxWindow::restore: reparent 0x"<<hex<<client->window()<<dec<<" to root"<<endl; | 3116 | cerr<<"FluxboxWindow::restore: reparent 0x"<<hex<<client->window()<<dec<<" to root"<<endl; |
3117 | #endif // DEBUG | 3117 | #endif // DEBUG |
3118 | if (!remap) | ||
3119 | client->hide(); | ||
3120 | // reparent to root window | 3118 | // reparent to root window |
3121 | client->reparent(screen().rootWindow().window(), frame().x(), frame().y()); | 3119 | client->reparent(screen().rootWindow().window(), frame().x(), frame().y()); |
3122 | } | 3120 | } |