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

overview: Center the dash vertically

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=682109
This commit is contained in:
Joost Verdoorn 2012-08-13 16:18:38 +02:00 committed by Florian Müllner
parent 7d12f47bf8
commit 0959adcfe3
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/ui/dash.js
View File

@ -331,8 +331,7 @@ const Dash = new Lang.Class({
this._container.add(this._showAppsIcon.actor); this._container.add(this._showAppsIcon.actor);
this.actor = new St.Bin({ child: this._container, this.actor = new St.Bin({ child: this._container });
y_align: St.Align.START });
this.actor.connect('notify::height', Lang.bind(this, this.actor.connect('notify::height', Lang.bind(this,
function() { function() {
if (this._maxHeight != this.actor.height) if (this._maxHeight != this.actor.height)

15
js/ui/overview.js
View File

@ -202,7 +202,6 @@ const Overview = new Lang.Class({
this._group.add_actor(this._dash.actor); this._group.add_actor(this._dash.actor);
// TODO - recalculate everything when desktop size changes // TODO - recalculate everything when desktop size changes
this._dash.actor.add_constraint(this._viewSelector.constrainY);
this._dash.actor.add_constraint(this._viewSelector.constrainHeight); this._dash.actor.add_constraint(this._viewSelector.constrainHeight);
this.dashIconSize = this._dash.iconSize; this.dashIconSize = this._dash.iconSize;
this._dash.connect('icon-size-changed', this._dash.connect('icon-size-changed',
@ -494,12 +493,7 @@ const Overview = new Lang.Class({
let searchY = contentY + this._spacing; let searchY = contentY + this._spacing;
let dashWidth = Math.round(DASH_SPLIT_FRACTION * primary.width); let dashWidth = Math.round(DASH_SPLIT_FRACTION * primary.width);
let viewWidth = primary.width - dashWidth - this._spacing; let dashY = searchY + searchHeight + this._spacing;
let viewHeight = contentHeight - 2 * this._spacing - searchHeight;
let viewY = contentY + this._spacing + searchHeight;
let viewX = rtl ? 0 : dashWidth + this._spacing;
// Set the dash's x position - y is handled by a constraint
let dashX; let dashX;
if (rtl) { if (rtl) {
this._dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST); this._dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
@ -507,9 +501,14 @@ const Overview = new Lang.Class({
} else { } else {
dashX = 0; dashX = 0;
} }
this._dash.actor.set_x(dashX);
let viewX = rtl ? 0 : dashWidth + this._spacing;
let viewY = searchY + searchHeight + this._spacing;
let viewWidth = primary.width - dashWidth - this._spacing;
let viewHeight = contentHeight - this._spacing - viewY;
this._searchEntry.set_position(searchX, searchY); this._searchEntry.set_position(searchX, searchY);
this._dash.actor.set_position(dashX, dashY);
this._viewSelector.actor.set_position(viewX, viewY); this._viewSelector.actor.set_position(viewX, viewY);
this._viewSelector.actor.set_size(viewWidth, viewHeight); this._viewSelector.actor.set_size(viewWidth, viewHeight);
}, },

2
js/ui/viewSelector.js
View File

@ -422,8 +422,6 @@ const ViewSelector = new Lang.Class({
// to use position and height properties directly, outside code would // to use position and height properties directly, outside code would
// need to ensure that the content is properly allocated before // need to ensure that the content is properly allocated before
// accessing the properties. // accessing the properties.
this.constrainY = new Clutter.BindConstraint({ source: this._pageArea,
coordinate: Clutter.BindCoordinate.Y });
this.constrainHeight = new Clutter.BindConstraint({ source: this._pageArea, this.constrainHeight = new Clutter.BindConstraint({ source: this._pageArea,
coordinate: Clutter.BindCoordinate.HEIGHT }); coordinate: Clutter.BindCoordinate.HEIGHT });
}, },