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

overviewControls: Make visible and inDrag private

Browse Source 
These don't need to be accessed from outside SlidingControl,
so don't let them be.
This commit is contained in:
Jasper St. Pierre 2013-09-18 19:06:56 -04:00
parent 3f1a252b91
commit f3186bd501
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/overviewControls.js
View File

@ -99,8 +99,8 @@ const SlidingControl = new Lang.Class({
_init: function(params) { _init: function(params) {
params = Params.parse(params, { slideDirection: SlideDirection.LEFT }); params = Params.parse(params, { slideDirection: SlideDirection.LEFT });
this.visible = true; this._visible = true;
this.inDrag = false; this._inDrag = false;
this.layout = new SlideLayout(); this.layout = new SlideLayout();
this.layout.slideDirection = params.slideDirection; this.layout.slideDirection = params.slideDirection;
@ -152,7 +152,7 @@ const SlidingControl = new Lang.Class({
let translationEnd = 0; let translationEnd = 0;
let translation = this._getTranslation(); let translation = this._getTranslation();
if (this.visible) { if (this._visible) {
translationStart = translation; translationStart = translation;
} else { } else {
translationEnd = translation; translationEnd = translation;
@ -169,7 +169,7 @@ const SlidingControl = new Lang.Class({
}, },
_onOverviewShowing: function() { _onOverviewShowing: function() {
this.visible = true; this._visible = true;
this.layout.slideX = this.getSlide(); this.layout.slideX = this.getSlide();
this.actor.translation_x = this._getTranslation(); this.actor.translation_x = this._getTranslation();
this.slideIn(); this.slideIn();
@ -188,13 +188,13 @@ const SlidingControl = new Lang.Class({
}, },
_onDragBegin: function() { _onDragBegin: function() {
this.inDrag = true; this._inDrag = true;
this.actor.translation_x = 0; this.actor.translation_x = 0;
this.updateSlide(); this.updateSlide();
}, },
_onDragEnd: function() { _onDragEnd: function() {
this.inDrag = false; this._inDrag = false;
this.updateSlide(); this.updateSlide();
}, },
@ -213,13 +213,13 @@ 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 // 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 // we will update slideX from pageEmpty
}, },
@ -256,7 +256,7 @@ const ThumbnailsSlider = new Lang.Class({
_getAlwaysZoomOut: function() { _getAlwaysZoomOut: function() {
// Always show the pager when hover, during a drag, or if workspaces are // Always show the pager when hover, during a drag, or if workspaces are
// actually used, e.g. there are windows on more than one // actually used, e.g. there are windows on more than one
let alwaysZoomOut = this.actor.hover || this.inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2; let alwaysZoomOut = this.actor.hover || this._inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;
if (!alwaysZoomOut) { if (!alwaysZoomOut) {
let monitors = Main.layoutManager.monitors; let monitors = Main.layoutManager.monitors;
@ -282,7 +282,7 @@ const ThumbnailsSlider = new Lang.Class({
}, },
getSlide: function() { getSlide: function() {
if (!this.visible) if (!this._visible)
return 0; return 0;
let alwaysZoomOut = this._getAlwaysZoomOut(); let alwaysZoomOut = this._getAlwaysZoomOut();
@ -329,7 +329,7 @@ const DashSlider = new Lang.Class({
}, },
getSlide: function() { getSlide: function() {
if (this.visible || this.inDrag) if (this._visible || this._inDrag)
return 1; return 1;
else else
return 0; return 0;