diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc index dc519c0..21018c2 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.178 2003/05/15 23:30:07 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.179 2003/05/17 11:08:06 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -361,7 +361,11 @@ void FluxboxWindow::init() { | |||
361 | 361 | ||
362 | #endif // DEBUG | 362 | #endif // DEBUG |
363 | 363 | ||
364 | Fluxbox &fluxbox = *Fluxbox::instance(); | ||
364 | 365 | ||
366 | // setup cursors for resize grips | ||
367 | frame().gripLeft().setCursor(fluxbox.getLowerLeftAngleCursor()); | ||
368 | frame().gripRight().setCursor(fluxbox.getLowerRightAngleCursor()); | ||
365 | 369 | ||
366 | frame().resize(m_client->width(), m_client->height()); | 370 | frame().resize(m_client->width(), m_client->height()); |
367 | TextButton *btn = new TextButton(frame().label(), | 371 | TextButton *btn = new TextButton(frame().label(), |
@@ -439,11 +443,9 @@ void FluxboxWindow::init() { | |||
439 | m_client->old_bw = wattrib.border_width; | 443 | m_client->old_bw = wattrib.border_width; |
440 | m_client->x = wattrib.x; m_client->y = wattrib.y; | 444 | m_client->x = wattrib.x; m_client->y = wattrib.y; |
441 | 445 | ||
442 | Fluxbox *fluxbox = Fluxbox::instance(); | 446 | fluxbox.saveWindowSearch(frame().window().window(), this); |
443 | |||
444 | fluxbox->saveWindowSearch(frame().window().window(), this); | ||
445 | 447 | ||
446 | m_timer.setTimeout(fluxbox->getAutoRaiseDelay()); | 448 | m_timer.setTimeout(fluxbox.getAutoRaiseDelay()); |
447 | m_timer.fireOnce(true); | 449 | m_timer.fireOnce(true); |
448 | 450 | ||
449 | if (m_client->initial_state == WithdrawnState) { | 451 | if (m_client->initial_state == WithdrawnState) { |
@@ -473,11 +475,11 @@ void FluxboxWindow::init() { | |||
473 | upsize(); | 475 | upsize(); |
474 | 476 | ||
475 | bool place_window = true; | 477 | bool place_window = true; |
476 | if (fluxbox->isStartup() || m_client->isTransient() || | 478 | if (fluxbox.isStartup() || m_client->isTransient() || |
477 | m_client->normal_hint_flags & (PPosition|USPosition)) { | 479 | m_client->normal_hint_flags & (PPosition|USPosition)) { |
478 | setGravityOffsets(); | 480 | setGravityOffsets(); |
479 | 481 | ||
480 | if (! fluxbox->isStartup()) { | 482 | if (! fluxbox.isStartup()) { |
481 | 483 | ||
482 | int real_x = frame().x(); | 484 | int real_x = frame().x(); |
483 | int real_y = frame().y(); | 485 | int real_y = frame().y(); |