← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-shell/trusty

« back to all changes in this revision

Viewing changes to js/ui/panel.js

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-07-31 21:29:20 UTC
  • mfrom: (1.1.51)
  • Revision ID: package-import@ubuntu.com-20130731212920-mz92zheiqgq2ggd1
Tags: 3.8.4-0ubuntu1
* New upstream release.
* debian/patches/git-dont-crash-for-unstaged-widgets.patch:
  - Dropped, applied in new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/ui/panel.js
371
371
        this._updateIconBoxClip();
372
372
    },
373
373
 
 
374
    _syncIcon: function() {
 
375
        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE, this._iconBox.text_direction);
 
376
        this._iconBox.set_child(icon);
 
377
    },
 
378
 
374
379
    _onIconThemeChanged: function() {
375
380
        if (this._iconBox.child == null)
376
381
            return;
377
382
 
378
 
        this._iconBox.child.destroy();
379
 
        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
380
 
        this._iconBox.set_child(icon);
 
383
        this._syncIcon();
381
384
    },
382
385
 
383
386
    _updateIconBoxClip: function() {
595
598
        }
596
599
 
597
600
        this._targetApp = targetApp;
598
 
        let icon = targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
599
 
 
600
601
        this._label.setText(targetApp.get_name());
601
602
        this.setName(targetApp.get_name());
602
603
 
603
 
        this._iconBox.set_child(icon);
 
604
        this._syncIcon();
604
605
        this._iconBox.show();
605
606
 
606
607
        if (targetApp.get_state() == Shell.AppState.STARTING)