Skip to content

Commit c2c3328

Browse files
committed
fix(x11/cinnamon): guard remaining virtualKeyboardManager references in cinnamon
- it will fix the issue that was cauing this error ``` (cinnamon:9449): Cjs-CRITICAL **: 19:05:13.867: JS ERROR: TypeError: Main.virtualKeyboardManager is undefined _updateVisibility@/data/data/com.termux/files/usr/share/cinnamon/js/ui/ibusCandidatePopup.js:304:25 setPanelService/<@/data/data/com.termux/files/usr/share/cinnamon/js/ui/ibusCandidatePopup.js:248:18 ```
1 parent 5a57f59 commit c2c3328

1 file changed

Lines changed: 40 additions & 3 deletions

File tree

x11-packages/cinnamon/0011-disable-virtualkeyboard.patch

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,45 @@
1+
diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js
2+
index c4048e3..7f0dedb 100644
3+
--- a/js/ui/ibusCandidatePopup.js
4+
+++ b/js/ui/ibusCandidatePopup.js
5+
@@ -260,12 +260,12 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
6+
for (let i = 0; (indexLabel = lookupTable.get_label(i)); ++i)
7+
indexes.push(indexLabel.get_text());
8+
9+
- Main.virtualKeyboardManager.resetSuggestions();
10+
+ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.resetSuggestions();
11+
12+
let candidates = [];
13+
for (let i = startIndex; i < endIndex; ++i) {
14+
candidates.push(lookupTable.get_candidate(i).get_text());
15+
- Main.virtualKeyboardManager.addSuggestion(lookupTable.get_candidate(i).get_text(), () => {
16+
+ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.addSuggestion(lookupTable.get_candidate(i).get_text(), () => {
17+
let index = i;
18+
this._panelService.candidate_clicked(index, 1, 0);
19+
});
20+
@@ -288,7 +288,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
21+
});
22+
panelService.connect('focus-out', () => {
23+
this.close(BoxPointer.PopupAnimation.NONE);
24+
- Main.virtualKeyboardManager.resetSuggestions();
25+
+ if (Main.virtualKeyboardManager) Main.virtualKeyboardManager.resetSuggestions();
26+
});
27+
}
28+
29+
@@ -301,7 +301,7 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
30+
}
31+
32+
_updateVisibility() {
33+
- let isVisible = !Main.virtualKeyboardManager.visible &&
34+
+ let isVisible = !(Main.virtualKeyboardManager && Main.virtualKeyboardManager.visible) &&
35+
(this._preeditText.visible ||
36+
this._auxText.visible ||
37+
this._candidateArea.visible);
138
diff --git a/js/ui/main.js b/js/ui/main.js
2-
index 1b1069e..d640b53 100644
39+
index e5f8daa..1b9077e 100644
340
--- a/js/ui/main.js
441
+++ b/js/ui/main.js
5-
@@ -97,7 +97,7 @@ var AppletManager = imports.ui.appletManager;
42+
@@ -100,7 +100,7 @@ var AppletManager = imports.ui.appletManager;
643
const SearchProviderManager = imports.ui.searchProviderManager;
744
const DeskletManager = imports.ui.deskletManager;
845
const ExtensionSystem = imports.ui.extensionSystem;
@@ -42,7 +79,7 @@ index 1b1069e..d640b53 100644
4279
Promise.all([
4380
AppletManager.init(),
4481
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
45-
index a12bcbb..1262d6d 100644
82+
index 495a01f..3b48b76 100644
4683
--- a/js/ui/popupMenu.js
4784
+++ b/js/ui/popupMenu.js
4885
@@ -3667,7 +3667,7 @@ var PopupMenuManager = class PopupMenuManager {

0 commit comments

Comments
 (0)