瀏覽代碼

Hide the toolbar when the the ring overlay is displayed

j8
paweldomas 9 年之前
父節點
當前提交
123b5abb08
共有 2 個檔案被更改,包括 12 行新增3 行删除
  1. 3
    3
      modules/UI/UI.js
  2. 9
    0
      modules/UI/ring_overlay/RingOverlay.js

+ 3
- 3
modules/UI/UI.js 查看文件

298
     UI.updateLocalRole(false);
298
     UI.updateLocalRole(false);
299
 
299
 
300
     // Once we've joined the muc show the toolbar
300
     // Once we've joined the muc show the toolbar
301
-    ToolbarToggler.showToolbar();
301
+    if (!RingOverlay.isDisplayed()) {
302
+        ToolbarToggler.showToolbar();
303
+    }
302
 
304
 
303
     let displayName = config.displayJids ? id : Settings.getDisplayName();
305
     let displayName = config.displayJids ? id : Settings.getDisplayName();
304
 
306
 
1413
 
1415
 
1414
 UI.showRingOverLay = function () {
1416
 UI.showRingOverLay = function () {
1415
     RingOverlay.show(APP.tokenData.callee);
1417
     RingOverlay.show(APP.tokenData.callee);
1416
-    ToolbarToggler.setAlwaysVisibleToolbar(true);
1417
     FilmStrip.toggleFilmStrip(false);
1418
     FilmStrip.toggleFilmStrip(false);
1418
 };
1419
 };
1419
 
1420
 
1420
 UI.hideRingOverLay = function () {
1421
 UI.hideRingOverLay = function () {
1421
     if (!RingOverlay.hide())
1422
     if (!RingOverlay.hide())
1422
         return;
1423
         return;
1423
-    ToolbarToggler.resetAlwaysVisibleToolbar();
1424
     FilmStrip.toggleFilmStrip(true);
1424
     FilmStrip.toggleFilmStrip(true);
1425
 };
1425
 };
1426
 
1426
 

+ 9
- 0
modules/UI/ring_overlay/RingOverlay.js 查看文件

78
         overlay.destroy();
78
         overlay.destroy();
79
         overlay = null;
79
         overlay = null;
80
         return true;
80
         return true;
81
+    },
82
+    /**
83
+     * Checks whether or not the ring overlay is currently displayed.
84
+     *
85
+     * @returns {boolean} true if the ring overlay is currently displayed or
86
+     * false otherwise.
87
+     */
88
+    isDisplayed () {
89
+        return overlay !== null;
81
     }
90
     }
82
 };
91
 };

Loading…
取消
儲存