← Back to branch summary

~alan-griffiths/miral/g++-7

« back to all changes in this revision

Viewing changes to miral-shell/tiling_window_manager.cpp

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2017-07-31 10:34:40 UTC
  • mfrom: (569.1.4 miral)
  • Revision ID: tarmac-20170731103440-re1gg9gkqh9ncsf6
Correct some conflation of the display and the outputs it includes.

Approved by Gerry Boland, mir-ci-bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
miral-shell/tiling_window_manager.cpp
457
457
        { return spinner.session() != info.application() && tile_for(info).contains(position);});
458
458
}
459
459
 
460
 
void TilingWindowManagerPolicy::update_tiles(Rectangles const& displays)
 
460
void TilingWindowManagerPolicy::update_tiles(Rectangles const& outputs)
461
461
{
462
462
    auto const tile_count = tiles.count();
463
463
 
464
 
    if (tile_count < 1 || displays.size() < 1) return;
 
464
    if (tile_count < 1 || outputs.size() < 1) return;
465
465
 
466
 
    auto const bounding_rect = displays.bounding_rectangle();
 
466
    auto const bounding_rect = outputs.bounding_rectangle();
467
467
 
468
468
    auto const total_width  = bounding_rect.size.width.as_int();
469
469
    auto const total_height = bounding_rect.size.height.as_int();
674
674
{
675
675
    if (dirty_displays)
676
676
    {
677
 
        // Need to acquire lock before accessing displays & dirty_tiles
 
677
        // Need to acquire lock before accessing outputs & dirty_tiles
678
678
        tools.invoke_under_lock([this]
679
679
            {
680
680
                displays = live_displays;