[gnome-documents] preview: fix preview controls showing up on error or in overview
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] preview: fix preview controls showing up on error or in overview
- Date: Fri, 8 Feb 2013 22:47:16 +0000 (UTC)
commit afa9f0f2dff69595922e69c1521ad396e1c7a526
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Feb 8 17:43:05 2013 -0500
preview: fix preview controls showing up on error or in overview
src/preview.js | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/src/preview.js b/src/preview.js
index 8d39fb5..f0ea900 100644
--- a/src/preview.js
+++ b/src/preview.js
@@ -39,6 +39,7 @@ const Places = imports.places;
const Searchbar = imports.searchbar;
const Utils = imports.utils;
const View = imports.view;
+const WindowMode = imports.windowMode;
const _FULLSCREEN_TOOLBAR_TIMEOUT = 2; // seconds
@@ -55,9 +56,12 @@ const PreviewView = new Lang.Class({
this._fsToolbar = null;
this._overlay = overlay;
this._lastSearch = '';
+ this._loadError = false;
Application.modeController.connect('fullscreen-changed', Lang.bind(this,
this._onFullscreenChanged));
+ Application.modeController.connect('window-mode-changed', Lang.bind(this,
+ this._onWindowModeChanged));
this.widget = new Gtk.ScrolledWindow({ hexpand: true,
vexpand: true,
@@ -126,7 +130,7 @@ const PreviewView = new Lang.Class({
Lang.bind(this, this._onLoadError));
},
- _onLoadStarted: function() {
+ _onLoadStarted: function() {
this._showPlaces.enabled = false;
},
@@ -141,7 +145,10 @@ const PreviewView = new Lang.Class({
_onLoadError: function(manager, doc, message, exception) {
this._controlsVisible = true;
+
+ this._loadError = true;
this._syncControlsVisible();
+ this._loadError = false;
},
_onActionStateChanged: function(source, actionName, state) {
@@ -212,7 +219,8 @@ const PreviewView = new Lang.Class({
if (this._controlsVisible) {
if (this._fsToolbar)
this._fsToolbar.show();
- this._navBar.show();
+ if (!this._loadError)
+ this._navBar.show();
} else {
if (this._fsToolbar)
this._fsToolbar.hide();
@@ -220,6 +228,12 @@ const PreviewView = new Lang.Class({
}
},
+ _onWindowModeChanged: function() {
+ let windowMode = Application.modeController.getWindowMode();
+ if (windowMode != WindowMode.WindowMode.PREVIEW)
+ this.controlsVisible = false;
+ },
+
_onFullscreenChanged: function() {
let fullscreen = Application.modeController.getFullscreen();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]