Skip to content

Commit

Permalink
Do not animate the window explicitly, just present() and hide()
Browse files Browse the repository at this point in the history 
Use "notify::visible" instead of "visibility-changed"
Remove AppStoreSlider class

[endlessm/eos-shell#1727]
  • Loading branch information
@felipeerias
felipeerias committed Jan 14, 2014
1 parent 030b758 commit 6a4ec8d
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 156 deletions.
6 changes: 3 additions & 3 deletions EosAppStore/appStore.js
View file
Expand Up @@ -89,7 +89,7 @@ const AppStore = new Lang.Class({
if (this._mainWindow == null) {
this._mainWindow = new AppStoreWindow.AppStoreWindow(this,
this._storeModel);
this._mainWindow.connect('visibility-changed',
this._mainWindow.connect('notify::visible',
Lang.bind(this, this._onVisibilityChanged));

// set initial page
Expand Down Expand Up @@ -147,8 +147,8 @@ const AppStore = new Lang.Class({
return false;
},

_onVisibilityChanged: function(proxy, visible) {
this.Visible = visible;
_onVisibilityChanged: function() {
this.Visible = this._mainWindow.is_visible();

let propChangedVariant = new GLib.Variant('(sa{sv}as)',
[APP_STORE_IFACE, { 'Visible': new GLib.Variant('b', this.Visible) }, []]);
Expand Down
218 changes: 65 additions & 153 deletions EosAppStore/appStoreWindow.js
View file
Expand Up @@ -14,7 +14,6 @@ const Signals = imports.signals;
const AppFrame = imports.appFrame;
const WeblinkFrame = imports.weblinkFrame;
const FolderFrame = imports.folderFrame;
const FrameClock = imports.frameClock;
const Path = imports.path;
const StoreModel = imports.storeModel;
const TwoLinesLabel = imports.twoLinesLabel;
Expand All @@ -25,6 +24,8 @@ const ANIMATION_TIME = (500 * 1000); // half a second

const PAGE_TRANSITION_MS = 500;

const SIDE_COMPONENT_ROLE = 'eos-side-component';

const AppStoreSizes = {
// Note: must be listed in order of increasing screenWidth
SVGA: { screenWidth: 800, windowWidth: 800 },
Expand All @@ -33,139 +34,6 @@ const AppStoreSizes = {
HD: { screenWidth: 1920, windowWidth: 1366 },
};

const AppStoreSlider = new Lang.Class({
Name: 'AppStoreSlider',
Extends: FrameClock.FrameClockAnimator,

_init: function(widget) {
this._showing = false;
this._willShow = false;
this.parent(widget, ANIMATION_TIME);
},

_getX: function(forVisibility) {
let [width, height] = this._getSize();
let workarea = this._getWorkarea();
let x = workarea.x - width;

if (forVisibility) {
x += width;
}

return x;
},

setValue: function(newX) {
let [, oldY] = this._widget.get_position();
this._widget.move(newX, oldY);
},

_getWorkarea: function() {
let screen = Gdk.Screen.get_default();
let monitor = screen.get_primary_monitor();
let workarea = screen.get_monitor_workarea(monitor);

return workarea;
},

_getResolution: function() {
let workarea = this._getWorkarea();
let resolution = null;

// Find the largest defined resolution that does not exceed
// the work area width
for (let i in AppStoreSizes) {
let res = AppStoreSizes[i];

if (workarea.width >= res.screenWidth) {
resolution = res;
}
}

return resolution;
},

_getSize: function() {
let workarea = this._getWorkarea();

let resolution = this._getResolution();

// If the work area is smaller than any defined resolution,
// use the full size of the work area
if (!resolution) {
return [workarea.width, workarea.height];
}

return [resolution.windowWidth, workarea.height];
},

_updateGeometry: function() {
let workarea = this._getWorkarea();
let [width, height] = this._getSize();
let x = this._getX(this.showing);

let geometry = { x: x,
y: workarea.y,
width: width,
height: height };


this._widget.move(geometry.x, geometry.y);
this._widget.set_size_request(geometry.width, geometry.height);
},

setInitialValue: function() {
this.stop();
this._updateGeometry();
},

slideIn: function() {
if (this._willShow) {
return;
}

this.setInitialValue();
this._widget.show();

this._willShow = true;
this.showing = true;
this.start(this._getX(false), this._getX(true));
},

slideOut: function() {
if (!this._willShow) {
return;
}

this._willShow = false;
this.start(this._getX(true), this._getX(false),
Lang.bind(this, function() {
this.showing = false;
this._widget.hide();
}));
},

set showing(value) {
this._showing = value;
this.emit('visibility-changed');
},

get showing() {
return this._showing;
},

get resolution() {
return this._getResolution();
},

get expectedWidth() {
let [width, height] = this._getSize();

return width;
},
});
Signals.addSignalMethods(AppStoreSlider.prototype);

const AppStoreWindow = new Lang.Class({
Name: 'AppStoreWindow',
Extends: Gtk.ApplicationWindow,
Expand Down Expand Up @@ -204,6 +72,7 @@ const AppStoreWindow = new Lang.Class({
this.parent({ application: app,
type_hint: Gdk.WindowTypeHint.DOCK,
type: Gtk.WindowType.TOPLEVEL,
role: SIDE_COMPONENT_ROLE
});

this.initTemplate({ templateRoot: 'main-frame', bindChildren: true, connectSignals: true, });
Expand Down Expand Up @@ -241,11 +110,7 @@ const AppStoreWindow = new Lang.Class({
this.set_visual(visual);
}

// initialize animator
this._animator = new AppStoreSlider(this);
this._animator.connect('visibility-changed', Lang.bind(this, this._onVisibilityChanged));
this._animator.setInitialValue();
this._animator.showing = false;
this._updateGeometry();

// the model that handles page changes
this._storeModel = storeModel;
Expand Down Expand Up @@ -281,6 +146,58 @@ const AppStoreWindow = new Lang.Class({
this._activeWindowId = 0;
}
},
_getWorkarea: function() {
let screen = Gdk.Screen.get_default();
let monitor = screen.get_primary_monitor();
let workarea = screen.get_monitor_workarea(monitor);

return workarea;
},

_getResolution: function() {
let workarea = this._getWorkarea();
let resolution = null;

// Find the largest defined resolution that does not exceed
// the work area width
for (let i in AppStoreSizes) {
let res = AppStoreSizes[i];

if (workarea.width >= res.screenWidth) {
resolution = res;
}
}

return resolution;
},

_getSize: function() {
let workarea = this._getWorkarea();

let resolution = this._getResolution();

// If the work area is smaller than any defined resolution,
// use the full size of the work area
if (!resolution) {
return [workarea.width, workarea.height];
}

return [resolution.windowWidth, workarea.height];
},

_updateGeometry: function() {
let workarea = this._getWorkarea();
let [width, height] = this._getSize();

let geometry = { x: workarea.x,
y: workarea.y,
width: width,
height: height };


this.move(geometry.x, geometry.y);
this.set_size_request(geometry.width, geometry.height);
},

_createStackPages: function() {
if (this._stack) {
Expand Down Expand Up @@ -335,7 +252,7 @@ const AppStoreWindow = new Lang.Class({
_onActiveWindowChanged: function(wmInspect, activeXid) {
let xid = this.get_window().get_xid();
if (xid != activeXid) {
this._animator.slideOut();
this.hide();
}
},

Expand Down Expand Up @@ -416,22 +333,14 @@ const AppStoreWindow = new Lang.Class({
},

_onAvailableAreaChanged: function() {
this._animator.setInitialValue();
this._updateGeometry();
this._createStackPages();
this._onStorePageChanged(this._storeModel, this._currentPage);
},

_onVisibilityChanged: function() {
this.emit('visibility-changed', this._animator.showing);
},

getVisible: function() {
return this._animator.showing;
},

toggle: function(reset, timestamp) {
if (this._animator.showing) {
this._animator.slideOut();
if (this.is_visible()) {
this.hide();
} else {
let page = this._pages[this._currentPage];
if (page && reset) {
Expand All @@ -443,12 +352,15 @@ const AppStoreWindow = new Lang.Class({
},

showPage: function(timestamp) {
this._animator.slideIn();
this._updateGeometry();
this.show();
this.present_with_time(timestamp);
},

getExpectedWidth: function() {
return this._animator.expectedWidth;
let [width, height] = this._getSize();

return width;
},

clearHeaderState: function() {
Expand Down

0 comments on commit 6a4ec8d

Please sign in to comment.