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

Revert "overviewControls: Don't allow appearing controls to "pop in""

Browse Source 
This reverts commit e31693bbee.

This doesn't properly adjust the allocation, leading to an unbalanced
overview where things aren't centered properly. Just revert for now,
and we'll rethink this next cycle.
This commit is contained in:
Jasper St. Pierre 2013-09-26 16:20:06 -04:00
parent 2d80cb71db
commit 508a511d2a
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/ui/overviewControls.js
View File

@ -208,12 +208,23 @@ const SlidingControl = new Lang.Class({
slideIn: function() { slideIn: function() {
this.visible = true; this.visible = true;
this._updateTranslation(); this._updateTranslation();
// we will update slideX and the translation from pageEmpty
}, },
slideOut: function() { slideOut: function() {
this.visible = false; this.visible = false;
this._updateTranslation(); this._updateTranslation();
// we will update slideX from pageEmpty
}, },
pageEmpty: function() {
// When pageEmpty is received, there's no visible view in the
// selector; this means we can now safely set the full slide for
// the next page, since slideIn or slideOut might have been called,
// changing the visiblity
this.layout.slideX = this.getSlide();
this._updateTranslation();
}
}); });
const ThumbnailsSlider = new Lang.Class({ const ThumbnailsSlider = new Lang.Class({
@ -589,14 +600,18 @@ const ControlsManager = new Lang.Class({
return; return;
let activePage = this.viewSelector.getActivePage(); let activePage = this.viewSelector.getActivePage();
let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS || let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
activePage == ViewSelector.ViewPage.APPS); activePage == ViewSelector.ViewPage.APPS);
if (!dashVisible) let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
if (dashVisible)
this._dashSlider.slideIn();
else
this._dashSlider.slideOut(); this._dashSlider.slideOut();
let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS); if (thumbnailsVisible)
if (!thumbnailsVisible) this._thumbnailsSlider.slideIn();
else
this._thumbnailsSlider.slideOut(); this._thumbnailsSlider.slideOut();
}, },
@ -609,16 +624,8 @@ const ControlsManager = new Lang.Class({
}, },
_onPageEmpty: function() { _onPageEmpty: function() {
let activePage = this.viewSelector.getActivePage(); this._dashSlider.pageEmpty();
this._thumbnailsSlider.pageEmpty();
let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
activePage == ViewSelector.ViewPage.APPS);
if (dashVisible)
this._dashSlider.slideIn();
let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
if (thumbnailsVisible)
this._thumbnailsSlider.slideIn();
this._updateSpacerVisibility(); this._updateSpacerVisibility();
} }