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

dash: Set scale and opacity on parent actor

Browse Source 
DashItemContainer currently animates the scale and opacity
of its child when zooming in. This is visible when adding
a new favorite item to the dash; the items will zoom in from
the center.

After the previous commit, however, the zoom animation got
slightly broken, and looked like the icon was coming from
the bottom instead of the center.

Fix that by setting the scale and opacity of DashItemContainer
itself, instead of its child. Remove the unused code after that
too.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/153
This commit is contained in:
Georges Basile Stavracas Neto 2018-08-23 12:17:21 -03:00
parent 81ec8215a0
commit efb3025d8c
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
js/ui/dash.js
View File

@ -38,7 +38,8 @@ var DashItemContainer = new Lang.Class({
Extends: St.Widget, Extends: St.Widget,
_init() { _init() {
this.parent({ style_class: 'dash-item-container' }); this.parent({ style_class: 'dash-item-container',
pivot_point: new Clutter.Point({ x: .5, y: .5 }) });
this._labelText = ""; this._labelText = "";
this.label = new St.Label({ style_class: 'dash-label'}); this.label = new St.Label({ style_class: 'dash-label'});
@ -56,52 +57,20 @@ var DashItemContainer = new Lang.Class({
}); });
}, },
vfunc_allocate(box, flags) {
this.set_allocation(box, flags);
if (this.child == null)
return;
let availWidth = box.x2 - box.x1;
let availHeight = box.y2 - box.y1;
let [minChildWidth, minChildHeight, natChildWidth, natChildHeight] =
this.child.get_preferred_size();
let [childScaleX, childScaleY] = this.child.get_scale();
let childWidth = Math.min(natChildWidth * childScaleX, availWidth);
let childHeight = Math.min(natChildHeight * childScaleY, availHeight);
let childBox = new Clutter.ActorBox();
childBox.x1 = (availWidth - childWidth) / 2;
childBox.y1 = (availHeight - childHeight) / 2;
childBox.x2 = childBox.x1 + childWidth;
childBox.y2 = childBox.y1 + childHeight;
this.child.allocate(childBox, flags);
},
vfunc_get_preferred_height(forWidth) { vfunc_get_preferred_height(forWidth) {
let themeNode = this.get_theme_node(); let themeNode = this.get_theme_node();
if (this.child == null)
return [0, 0];
forWidth = themeNode.adjust_for_width(forWidth); forWidth = themeNode.adjust_for_width(forWidth);
let [minHeight, natHeight] = this.child.get_preferred_height(forWidth); let [minHeight, natHeight] = this.parent(forWidth);
return themeNode.adjust_preferred_height(minHeight * this.child.scale_y, return themeNode.adjust_preferred_height(minHeight * this.scale_y,
natHeight * this.child.scale_y); natHeight * this.scale_y);
}, },
vfunc_get_preferred_width(forHeight) { vfunc_get_preferred_width(forHeight) {
let themeNode = this.get_theme_node(); let themeNode = this.get_theme_node();
if (this.child == null)
return [0, 0];
forHeight = themeNode.adjust_for_height(forHeight); forHeight = themeNode.adjust_for_height(forHeight);
let [minWidth, natWidth] = this.child.get_preferred_width(forHeight); let [minWidth, natWidth] = this.parent(forHeight);
return themeNode.adjust_preferred_width(minWidth * this.child.scale_y, return themeNode.adjust_preferred_width(minWidth * this.scale_x,
natWidth * this.child.scale_y); natWidth * this.scale_x);
}, },
showLabel() { showLabel() {
@ -163,9 +132,8 @@ var DashItemContainer = new Lang.Class({
this.child = actor; this.child = actor;
this.add_actor(this.child); this.add_actor(this.child);
this.child.set_scale_with_gravity(this._childScale, this._childScale, this.set_scale(this._childScale, this._childScale);
Clutter.Gravity.CENTER); this.set_opacity(this._childOpacity);
this.child.set_opacity(this._childOpacity);
}, },
show(animate) { show(animate) {
@ -204,11 +172,7 @@ var DashItemContainer = new Lang.Class({
set childScale(scale) { set childScale(scale) {
this._childScale = scale; this._childScale = scale;
if (this.child == null) this.set_scale(scale, scale);
return;
this.child.set_scale_with_gravity(scale, scale,
Clutter.Gravity.CENTER);
this.queue_relayout(); this.queue_relayout();
}, },
@ -219,10 +183,7 @@ var DashItemContainer = new Lang.Class({
set childOpacity(opacity) { set childOpacity(opacity) {
this._childOpacity = opacity; this._childOpacity = opacity;
if (this.child == null) this.set_opacity(opacity);
return;
this.child.set_opacity(opacity);
this.queue_redraw(); this.queue_redraw();
}, },