From 235ec7cb2ec982379060cc0a580d0e45180178b5 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Thu, 14 Feb 2013 23:37:35 +0100 Subject: [PATCH] CandidateArea: make setOrientation() public 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 --- js/ui/ibusCandidatePopup.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js index d9bb7700d..bfebf168a 100644 --- a/js/ui/ibusCandidatePopup.js +++ b/js/ui/ibusCandidatePopup.js @@ -51,7 +51,7 @@ const CandidateArea = new Lang.Class({ this._cursorPosition = 0; }, - _setOrientation: function(orientation) { + setOrientation: function(orientation) { if (this._orientation == orientation) return; @@ -72,9 +72,7 @@ const CandidateArea = new Lang.Class({ } }, - setCandidates: function(indexes, candidates, orientation, cursorPosition, cursorVisible) { - this._setOrientation(orientation); - + setCandidates: function(indexes, candidates, cursorPosition, cursorVisible) { for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) { let visible = i < candidates.length; let box = this._candidateBoxes[i]; @@ -215,9 +213,9 @@ const CandidatePopup = new Lang.Class({ this._candidateArea.setCandidates(indexes, candidates, - lookupTable.get_orientation(), cursorPos % pageSize, lookupTable.is_cursor_visible()); + this._candidateArea.setOrientation(lookupTable.get_orientation()); this._candidateArea.updateButtons(lookupTable.is_round(), page, nPages); })); panelService.connect('show-lookup-table',