diff options
author | rathnor <rathnor> | 2003-02-16 17:57:54 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-02-16 17:57:54 (GMT) |
commit | 79aec8465f8a1e618034ac08fa2d55fcca09eb5a (patch) | |
tree | 38b171d9f1e49dd04fdc30fcddf5d2caeb1d97a1 /src/Window.cc | |
parent | 9a82a5b1dc3cacafbdda7b54fb9ebf71ef526be3 (diff) | |
download | fluxbox_pavel-79aec8465f8a1e618034ac08fa2d55fcca09eb5a.zip fluxbox_pavel-79aec8465f8a1e618034ac08fa2d55fcca09eb5a.tar.bz2 |
Fixed gnome init problems (Simon)
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc index a8d3f8a..517074d 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.116 2003/02/16 15:12:07 rathnor Exp $ | 25 | // $Id: Window.cc,v 1.117 2003/02/16 17:57:53 rathnor Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -261,7 +261,7 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num, | |||
261 | if (workspace_number < 0 || workspace_number >= screen->getCount()) | 261 | if (workspace_number < 0 || workspace_number >= screen->getCount()) |
262 | workspace_number = screen->getCurrentWorkspaceID(); | 262 | workspace_number = screen->getCurrentWorkspaceID(); |
263 | 263 | ||
264 | restoreAttributes(place_window); | 264 | restoreAttributes(); |
265 | 265 | ||
266 | moveToLayer(m_layernum); | 266 | moveToLayer(m_layernum); |
267 | screen->getWorkspace(workspace_number)->addWindow(this, place_window); | 267 | screen->getWorkspace(workspace_number)->addWindow(this, place_window); |
@@ -289,10 +289,6 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num, | |||
289 | // no focus default | 289 | // no focus default |
290 | setFocusFlag(false); | 290 | setFocusFlag(false); |
291 | 291 | ||
292 | // finaly show the frame and the client window | ||
293 | |||
294 | m_frame.show(); | ||
295 | XSync(display, False); | ||
296 | } | 292 | } |
297 | 293 | ||
298 | 294 | ||
@@ -931,6 +927,15 @@ void FluxboxWindow::setTab(bool flag) { | |||
931 | */ | 927 | */ |
932 | } | 928 | } |
933 | 929 | ||
930 | void FluxboxWindow::hide() { | ||
931 | m_windowmenu.hide(); | ||
932 | m_frame.hide(); | ||
933 | } | ||
934 | |||
935 | void FluxboxWindow::show() { | ||
936 | m_frame.show(); | ||
937 | } | ||
938 | |||
934 | /** | 939 | /** |
935 | Unmaps the window and removes it from workspace list | 940 | Unmaps the window and removes it from workspace list |
936 | */ | 941 | */ |
@@ -1103,6 +1108,7 @@ void FluxboxWindow::maximizeVertical() { | |||
1103 | 1108 | ||
1104 | 1109 | ||
1105 | void FluxboxWindow::setWorkspace(int n) { | 1110 | void FluxboxWindow::setWorkspace(int n) { |
1111 | |||
1106 | workspace_number = n; | 1112 | workspace_number = n; |
1107 | 1113 | ||
1108 | blackbox_attrib.flags |= BaseDisplay::ATTRIB_WORKSPACE; | 1114 | blackbox_attrib.flags |= BaseDisplay::ATTRIB_WORKSPACE; |
@@ -1501,7 +1507,7 @@ void FluxboxWindow::setGravityOffsets() { | |||
1501 | * but doesn't change the actual state | 1507 | * but doesn't change the actual state |
1502 | * (so the caller can set defaults etc as well) | 1508 | * (so the caller can set defaults etc as well) |
1503 | */ | 1509 | */ |
1504 | void FluxboxWindow::restoreAttributes(bool place_window) { | 1510 | void FluxboxWindow::restoreAttributes() { |
1505 | if (!getState()) | 1511 | if (!getState()) |
1506 | current_state = NormalState; | 1512 | current_state = NormalState; |
1507 | 1513 | ||