[gnome-shell-extensions] Revert "window-list: add a workspace switcher"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] Revert "window-list: add a workspace switcher"
- Date: Tue, 9 Apr 2013 00:25:21 +0000 (UTC)
commit 689dda05159fd99e116c28b05a67c90f6b146f0d
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Apr 8 20:25:33 2013 -0400
Revert "window-list: add a workspace switcher"
This reverts commit f86f09955bf9a697fbe82ea2b6811badee7be037.
Pushed by accident.
extensions/window-list/extension.js | 134 ---------------------------------
extensions/window-list/stylesheet.css | 30 +-------
2 files changed, 4 insertions(+), 160 deletions(-)
---
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index 10bc7ee..9d21ded 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -401,9 +401,6 @@ const WindowList = new Lang.Class({
this._windowList.layout_manager.spacing = spacing;
}));
- this._workspaceSwitcher = new WorkspaceSwitcher();
- box.add(this._workspaceSwitcher.actor);
-
this._trayButton = new TrayButton();
box.add(this._trayButton.actor);
@@ -687,137 +684,6 @@ const WindowList = new Lang.Class({
}
});
-// Some of this class and the following one were
-// copied from Frippery Bottom Panel
-// Copyright 2011-2012 R M Yorston
-
-const WorkspaceButton = new Lang.Class({
- Name: 'WorkspaceButton',
-
- _init: function(index) {
- this.actor = new St.Button({ name: 'workspaceButton',
- style_class: 'window-list-workspace-button',
- reactive: true });
- this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-
- this.label = new St.Label();
- this.actor.set_child(this.label);
-
- this.actor.label_actor = this.label;
- this.setIndex(index);
- },
-
- _onClicked: function() {
- if (this.index >= 0 && this.index < global.screen.n_workspaces) {
- let metaWorkspace = global.screen.get_workspace_by_index(this.index);
- metaWorkspace.activate(global.get_current_time());
- }
-
- return true;
- },
-
- setIndex: function(index) {
- if (index < 0 || index >= global.screen.n_workspaces) {
- return;
- }
-
- this.index = index;
-
- let active = global.screen.get_active_workspace_index();
- this.setActive(index == active);
- },
-
- setActive: function(active) {
- if (active) {
- this.label.set_text('-' + (this.index + 1) + '-');
- this.actor.add_style_pseudo_class('outlined');
- } else {
- this.label.set_text(String(this.index + 1));
- this.actor.remove_style_pseudo_class('outlined');
- }
- }
-});
-
-const WorkspaceSwitcher = new Lang.Class({
- Name: 'WorkspaceSwitcher',
-
- _init: function() {
- this.actor = new St.BoxLayout({ name: 'workspaceSwitcher',
- style_class: 'window-list-workspace-switcher',
- reactive: true });
- this.actor.connect('scroll-event', this._onScroll);
- this.actor.connect('destroy', this._onDestroy);
- this.actor._delegate = this;
- this.button = [];
- this._active = 0;
- this._createButtons();
-
- this._nWorkspacesId = global.screen.connect('notify::n-workspaces',
- Lang.bind(this, this._createButtons));
- this._switchWorkspaceId = global.screen.connect('workspace-switched',
- Lang.bind(this, this._updateButtons));
- },
-
- _onDestroy: function() {
- if (this._nWorkspacesId) {
- global.screen.disconnect(this._nWorkspacesId);
- this._nWorkspacesId = 0;
- }
-
- if (this._switchWorkspaceId) {
- global.screen.disconnect(this._switchWorkspaceId);
- this._switchWorkspaceId = 0;
- }
- },
-
- _createButtons: function() {
- let nPresent = this.actor.get_n_children();
- let nWanted = global.screen.n_workspaces;
- if (nPresent == nWanted)
- return;
-
- if (nPresent > nWanted) {
- for (let i = nWanted; i < nPresent; i++)
- this.button[i].actor.destroy();
- } else {
- for (let i = nPresent; i < nWanted; i++) {
- let button = new WorkspaceButton(i);
- this.button[i] = button;
- this.actor.insert_child_at_index(button.actor, i);
- }
- }
-
- this.button.length = nWanted;
- },
-
- _updateButtons: function() {
- let active = global.screen.get_active_workspace_index();
- this.button[this._active].setActive(false);
- this.button[active].setActive(true);
-
- this._active = active;
- },
-
- _onScroll: function(actor, event) {
- let direction = event.get_scroll_direction();
-
- let metaDirection;
- if (direction == Clutter.ScrollDirection.UP)
- metaDirection = Meta.MotionDirection.UP;
- else if (direction == Clutter.ScrollDirection.DOWN)
- metaDirection = Meta.MotionDirection.DOWN;
- else
- // We don't handle any other direction
- return;
-
- let activeWorkspace = global.screen.get_active_workspace();
- let toActivate = activeWorkspace.get_neighbor(metaDirection);
-
- if (activeWorkspace != toActivate)
- toActivate.activate(global.get_current_time());
- },
-});
-
let windowList;
let injections = {};
let notificationParent;
diff --git a/extensions/window-list/stylesheet.css b/extensions/window-list/stylesheet.css
index 8186551..d98712f 100644
--- a/extensions/window-list/stylesheet.css
+++ b/extensions/window-list/stylesheet.css
@@ -1,5 +1,8 @@
.bottom-panel {
- height: 32px;
+ /* .window-button-icon height +
+ .window-button vertical padding +
+ .window-button > StWidget vertical padding) */
+ height: 30px;
}
.window-list {
@@ -62,28 +65,3 @@
width: 24px;
height: 24px;
}
-
-.window-list-workspace-switcher {
- spacing: 6px;
-}
-
-.window-list-workspace-button {
- min-width: 2.5em;
- color: #ccc;
- transition-duration: 100;
- border: 1px;
- border-color: #ccc;
- padding: 0 2px;
-}
-
-.window-list-workspace-button:outlined {
- padding: 0 1px;
- border: 2px solid white;
- background: #222;
- font-weight: bold;
-}
-
-.window-list-workspace-button:hover {
- color: white;
- text-shadow: black 0px 2px 2px;
-}
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]