← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/PanelMenuView.cpp

  • Committer: Didier Roche
  • Date: 2011-09-30 15:48:15 UTC
  • mfrom: (1677.1.4 unity)
  • Revision ID: didier.roche@canonical.com-20110930154815-vhyxbwe6s0qp89j0
- Focus the desktop when the desktop is mapped and that there is no other window around (focus on startup in particular) (LP: #863037)
- Show the 'Desktop' label when desktop has been focused (LP: #863129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/PanelMenuView.cpp
660
660
      // Make the special 
661
661
      label = g_strdup(g_dgettext("nautilus", "Desktop"));
662
662
    }
663
 
 
664
 
    if (!WindowManager::Default()->IsWindowOnCurrentDesktop(window_xid) ||
 
663
    else if (!WindowManager::Default()->IsWindowOnCurrentDesktop(window_xid) ||
665
664
        WindowManager::Default()->IsWindowObscured(window_xid))
666
665
    {
667
666
       return g_strdup("");