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

window-manager: Swap workspace order for RTL locales

Browse Source 
Workspaces should be aligned from right to left in RTL locales, so
take the text direction into account when switching workspaces.

https://bugzilla.gnome.org/show_bug.cgi?id=634691
This commit is contained in:
Florian Müllner 2010-11-12 16:22:05 +01:00
parent 1a466cfce4
commit 1efb0213c5
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/ui/windowManager.js
View File

@ -543,24 +543,34 @@ WindowManager.prototype = {
}, },
actionMoveWorkspaceLeft: function() { actionMoveWorkspaceLeft: function() {
let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
let activeWorkspaceIndex = global.screen.get_active_workspace_index(); let activeWorkspaceIndex = global.screen.get_active_workspace_index();
if (activeWorkspaceIndex > 0) { let indexToActivate = activeWorkspaceIndex;
global.screen.get_workspace_by_index(activeWorkspaceIndex - 1).activate(global.get_current_time()); if (rtl && activeWorkspaceIndex < global.screen.n_workspaces - 1)
if (!Main.overview.visible) indexToActivate++;
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex - 1); else if (!rtl && activeWorkspaceIndex > 0)
} else if (!Main.overview.visible) { indexToActivate--;
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex);
} if (indexToActivate != activeWorkspaceIndex)
global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());
if (!Main.overview.visible)
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, indexToActivate);
}, },
actionMoveWorkspaceRight: function() { actionMoveWorkspaceRight: function() {
let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
let activeWorkspaceIndex = global.screen.get_active_workspace_index(); let activeWorkspaceIndex = global.screen.get_active_workspace_index();
if (activeWorkspaceIndex < global.screen.n_workspaces - 1) { let indexToActivate = activeWorkspaceIndex;
global.screen.get_workspace_by_index(activeWorkspaceIndex + 1).activate(global.get_current_time()); if (rtl && activeWorkspaceIndex > 0)
if (!Main.overview.visible) indexToActivate--;
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex + 1); else if (!rtl && activeWorkspaceIndex < global.screen.n_workspaces - 1)
} else if (!Main.overview.visible) { indexToActivate++;
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex);
} if (indexToActivate != activeWorkspaceIndex)
global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());
if (!Main.overview.visible)
this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
} }
}; };

6
js/ui/workspaceSwitcherPopup.js
View File

@ -89,6 +89,7 @@ WorkspaceSwitcherPopup.prototype = {
let children = this._list.get_children(); let children = this._list.get_children();
let childBox = new Clutter.ActorBox(); let childBox = new Clutter.ActorBox();
let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
let x = box.x1; let x = box.x1;
let prevChildBoxX2 = box.x1 - this._itemSpacing; let prevChildBoxX2 = box.x1 - this._itemSpacing;
for (let i = 0; i < children.length; i++) { for (let i = 0; i < children.length; i++) {
@ -98,6 +99,11 @@ WorkspaceSwitcherPopup.prototype = {
childBox.y2 = box.y1 + this._childHeight; childBox.y2 = box.y1 + this._childHeight;
x += this._childWidth + this._itemSpacing; x += this._childWidth + this._itemSpacing;
prevChildBoxX2 = childBox.x2; prevChildBoxX2 = childBox.x2;
if (rtl) {
let ltrChildBoxX1 = childBox.x1;
childBox.x1 = box.x2 - (childBox.x2 - box.x1);
childBox.x2 = box.x2 - (ltrChildBoxX1 - box.x1);
}
children[i].allocate(childBox, flags); children[i].allocate(childBox, flags);
} }
}, },