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

CandidateArea: make setOrientation() public

Browse Source 
setCandidates() has too many arguments and setting the orientation
isn't particularly related with it. It might also be useful to switch
orientation without changing the candidates.

https://bugzilla.gnome.org/show_bug.cgi?id=691902
This commit is contained in:
Rui Matos 2013-02-14 23:37:35 +01:00
parent 4f8586d81d
commit 235ec7cb2e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/ibusCandidatePopup.js
View File

@ -51,7 +51,7 @@ const CandidateArea = new Lang.Class({
this._cursorPosition = 0; this._cursorPosition = 0;
}, },
_setOrientation: function(orientation) { setOrientation: function(orientation) {
if (this._orientation == orientation) if (this._orientation == orientation)
return; return;
@ -72,9 +72,7 @@ const CandidateArea = new Lang.Class({
} }
}, },
setCandidates: function(indexes, candidates, orientation, cursorPosition, cursorVisible) { setCandidates: function(indexes, candidates, cursorPosition, cursorVisible) {
this._setOrientation(orientation);
for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) { for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
let visible = i < candidates.length; let visible = i < candidates.length;
let box = this._candidateBoxes[i]; let box = this._candidateBoxes[i];
@ -215,9 +213,9 @@ const CandidatePopup = new Lang.Class({
this._candidateArea.setCandidates(indexes, this._candidateArea.setCandidates(indexes,
candidates, candidates,
lookupTable.get_orientation(),
cursorPos % pageSize, cursorPos % pageSize,
lookupTable.is_cursor_visible()); lookupTable.is_cursor_visible());
this._candidateArea.setOrientation(lookupTable.get_orientation());
this._candidateArea.updateButtons(lookupTable.is_round(), page, nPages); this._candidateArea.updateButtons(lookupTable.is_round(), page, nPages);
})); }));
panelService.connect('show-lookup-table', panelService.connect('show-lookup-table',