Merge pull request #10853 from alivedise/bugzilla/889175_v1-train

Bug 889175 - Fix UI problem of fullscreen app when call incoming, r=timdream, a=leo+
mozilla-b2g · Jul 9, 2013 · 4d6b55c · 4d6b55c
2 parents cd41b9f + fa78ae8
commit 4d6b55c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -117,11 +117,11 @@ var StatusBar = {
 
   /* For other modules to acquire */
   get height() {
-    if (this.screen.classList.contains('fullscreen-app') ||
+    if (this.screen.classList.contains('active-statusbar')) {
+      return this.attentionBar.offsetHeight;
+    } else if (this.screen.classList.contains('fullscreen-app') ||
         document.mozFullScreen) {
       return 0;
-    } else if (this.screen.classList.contains('active-statusbar')) {
-      return this.attentionBar.offsetHeight;
     } else {
       return this._cacheHeight ||
              (this._cacheHeight = this.element.getBoundingClientRect().height);

diff --git a/apps/system/style/attention_screen.css b/apps/system/style/attention_screen.css
@@ -23,6 +23,10 @@
   transition: none;
 }
 
+#screen.attention.active-statusbar #statusbar {
+  display: none;
+}
+
 #attention-screen.status-mode > iframe {
   margin-top: 0;
   height: 100%;

diff --git a/apps/system/style/system/system.css b/apps/system/style/system/system.css
@@ -260,8 +260,10 @@ body {
   border: none;
 }
 
-#screen.active-statusbar #windows > .appWindow {
-  top: 40px;
+#screen.active-statusbar #windows > .appWindow,
+#screen.active-statusbar #windows > .appWindow.fullscreen-app {
+  top: 4rem;
+  height: calc(100% - 4rem);
 }
 
 #windows > .appWindow:not(.homescreen) {