← Back to branch summary

~lbrulet-8/compiz-plugins-main/fix-876591

« back to all changes in this revision

Viewing changes to staticswitcher/src/staticswitcher.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-03-22 21:47:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20110322214711-ova37916nobmtxyc
Tags: upstream-0.9.4git20110322
Import upstream version 0.9.4git20110322

Show diffs side-by-side

added added

removed removed

Lines of Context:
staticswitcher/src/staticswitcher.cpp
172
172
 
173
173
    if (w->isViewable () || w->shaded ())
174
174
    {
175
 
        rect = w->inputRect ();
 
175
        rect = w->borderRect ();
176
176
        return true;
177
177
    }
178
178
    else if (mode == HighlightRectHiddenTaskbarEntry &&
186
186
    }
187
187
    else if (mode == HighlightRectHiddenOriginalWindowPosition)
188
188
    {
189
 
        rect = w->serverInputRect ();
 
189
        rect = w->serverBorderRect ();
190
190
 
191
191
        if (opacity)
192
192
            *opacity /= 4;
282
282
 
283
283
        ::screen->setWindowProp (popupWindow, Atoms::winDesktop, 0xffffffff);
284
284
 
285
 
        setSelectedWindowHint ();
 
285
        setSelectedWindowHint (false);
286
286
 
287
287
        updatePopupWindow ();
288
288
    }
374
374
                    showPopup ();
375
375
                }
376
376
 
377
 
                setSelectedWindowHint ();
 
377
                setSelectedWindowHint (optionGetFocusOnSwitch ());
378
378
            }
379
379
 
380
380
            lastActiveWindow = screen->activeWindow ();
451
451
                w->moveInputFocusTo ();
452
452
        }
453
453
 
454
 
        ss->setSelectedWindowHint ();
 
454
        ss->setSelectedWindowHint (false);
455
455
 
456
456
        ss->lastActiveNum = 0;
457
457
 
505
505
            action->setState (action->state () | CompAction::StateTermButton);
506
506
    }
507
507
 
508
 
    ss->switchToWindow (nextWindow, ss->optionGetAutoChangeVp ());
 
508
    ss->switchToWindow (nextWindow, ss->optionGetAutoChangeVp (), ss->optionGetFocusOnSwitch ());
509
509
 
510
510
    return false;
511
511
}
606
606
            if (popup)
607
607
                CompositeWindow::get (popup)->addDamage ();
608
608
 
609
 
            setSelectedWindowHint ();
 
609
            setSelectedWindowHint (optionGetFocusOnSwitch ());
610
610
        }
611
611
 
612
612
        if (old != selectedWindow)