brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app-display: Slight cleanup and style update

Browse Source 
Being no longer an independent menu pane, both the toggle() and
close() functions are no longer needed, and the view's structure
can be simplified a bit.

Also update the style to fit into the view selector.

https://bugzilla.gnome.org/show_bug.cgi?id=634948
This commit is contained in:
Florian Müllner 2010-09-30 17:43:07 +02:00
parent 1a77acfda6
commit 1eb6dfe1b8
2 changed files with 7 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/theme/gnome-shell.css
View File

@ -508,10 +508,7 @@ StTooltip StLabel {
} }
.all-app { .all-app {
border-radius: 10px; padding: 10px;
background-color: #111111;
border: 2px solid #868686;
color: #ffffff;
} }
.app-section-divider-container { .app-section-divider-container {
@ -524,16 +521,6 @@ StTooltip StLabel {
background-image: url("separator-white.png"); background-image: url("separator-white.png");
} }
.all-app-controls-panel {
height: 30px;
}
.all-app-scroll-view {
padding-right: 10px;
padding-left: 10px;
padding-bottom: 10px;
}
#dash > .app-well-app { #dash > .app-well-app {
padding: 6px 12px; padding: 6px 12px;
} }

47
js/ui/appDisplay.js
View File

@ -148,22 +148,14 @@ AllAppDisplay.prototype = {
Main.queueDeferredWork(this._workId); Main.queueDeferredWork(this._workId);
})); }));
let bin = new St.BoxLayout({ style_class: 'all-app-controls-panel', this._scrollView = new St.ScrollView({ x_fill: true,
reactive: true });
this.actor = new St.BoxLayout({ style_class: 'all-app', vertical: true });
this.actor.hide();
let view = new St.ScrollView({ x_fill: true,
y_fill: false, y_fill: false,
style_class: 'all-app-scroll-view',
vshadows: true }); vshadows: true });
this._scrollView = view; this.actor = new St.Bin({ style_class: 'all-app',
this.actor.add(bin); y_align: St.Align.START,
this.actor.add(view, { expand: true, y_fill: false, y_align: St.Align.START }); child: this._scrollView });
this._appView = new ViewByCategories(); this._appView = new ViewByCategories();
this._appView.connect('launching', Lang.bind(this, this.close));
this._appView.connect('drag-begin', Lang.bind(this, this.close));
this._scrollView.add_actor(this._appView.actor); this._scrollView.add_actor(this._appView.actor);
this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
@ -177,37 +169,6 @@ AllAppDisplay.prototype = {
}); });
this._appView.refresh(apps); this._appView.refresh(apps);
},
toggle: function() {
if (this.actor.visible) {
Tweener.addTween(this.actor,
{ opacity: 0,
time: Overview.PANE_FADE_TIME,
transition: 'easeOutQuad',
onComplete: Lang.bind(this,
function() {
this.actor.hide();
this.emit('open-state-changed',
this.actor.visible);
})
});
} else {
this.actor.show();
this.emit('open-state-changed', this.actor.visible);
this.actor.opacity = 0;
Tweener.addTween(this.actor,
{ opacity: 255,
time: Overview.PANE_FADE_TIME,
transition: 'easeOutQuad'
});
}
},
close: function() {
if (!this.actor.visible)
return;
this.toggle();
} }
}; };