mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 967793 - Move CAO adjustment of notificationbox padding into CSS via a navbar=visible broadcaster. r=mbrubeck
This commit is contained in:
parent
77244b1221
commit
e22760428b
@ -117,8 +117,9 @@ var ContentAreaObserver = {
|
||||
let newWidth = width || this.width;
|
||||
let newHeight = height || this.height;
|
||||
|
||||
if (newHeight == oldHeight && newWidth == oldWidth)
|
||||
if (newHeight == oldHeight && newWidth == oldWidth) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.styles["window-width"].width = newWidth + "px";
|
||||
this.styles["window-width"].maxWidth = newWidth + "px";
|
||||
@ -132,28 +133,15 @@ var ContentAreaObserver = {
|
||||
},
|
||||
|
||||
updateContentArea: function cao_updateContentArea (width, height) {
|
||||
if (Browser.selectedBrowser) {
|
||||
let notificationBox = Browser.getNotificationBox();
|
||||
|
||||
// If a notification and navbar are visible together,
|
||||
// make the notification appear above the navbar.
|
||||
if (ContextUI.navbarVisible && !notificationBox.notificationsHidden &&
|
||||
notificationBox.allNotifications.length != 0) {
|
||||
let navbarHeight = Elements.navbar.getBoundingClientRect().height;
|
||||
notificationBox.style.paddingBottom = navbarHeight + "px";
|
||||
} else {
|
||||
notificationBox.style.paddingBottom = "";
|
||||
}
|
||||
}
|
||||
|
||||
let oldHeight = parseInt(this.styles["content-height"].height);
|
||||
let oldWidth = parseInt(this.styles["content-width"].width);
|
||||
|
||||
let newWidth = width || this.width;
|
||||
let newHeight = height || this.contentHeight;
|
||||
|
||||
if (newHeight == oldHeight && newWidth == oldWidth)
|
||||
if (newHeight == oldHeight && newWidth == oldWidth) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.styles["content-height"].height = newHeight + "px";
|
||||
this.styles["content-height"].maxHeight = newHeight + "px";
|
||||
@ -171,8 +159,9 @@ var ContentAreaObserver = {
|
||||
let newWidth = width || this.width;
|
||||
let newHeight = height || this.viewableHeight;
|
||||
|
||||
if (newHeight == oldHeight && newWidth == oldWidth)
|
||||
if (newHeight == oldHeight && newWidth == oldWidth) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.styles["viewable-height"].height = newHeight + "px";
|
||||
this.styles["viewable-height"].maxHeight = newHeight + "px";
|
||||
|
@ -175,6 +175,7 @@ var ContextUI = {
|
||||
// Display the nav bar
|
||||
displayNavbar: function () {
|
||||
Elements.navbar.show();
|
||||
Elements.chromeState.setAttribute("navbar", "visible");
|
||||
ContentAreaObserver.updateContentArea();
|
||||
},
|
||||
|
||||
@ -189,6 +190,7 @@ var ContextUI = {
|
||||
if (!BrowserUI.isStartTabVisible) {
|
||||
Elements.autocomplete.closePopup();
|
||||
Elements.navbar.dismiss();
|
||||
Elements.chromeState.removeAttribute("navbar");
|
||||
ContentAreaObserver.updateContentArea();
|
||||
}
|
||||
},
|
||||
|
@ -32,6 +32,7 @@ let Elements = {};
|
||||
["urlbarState", "bcast_urlbarState"],
|
||||
["loadingState", "bcast_loadingState"],
|
||||
["windowState", "bcast_windowState"],
|
||||
["chromeState", "bcast_chromeState"],
|
||||
["mainKeyset", "mainKeyset"],
|
||||
["stack", "stack"],
|
||||
["tabList", "tabs"],
|
||||
|
@ -69,6 +69,8 @@
|
||||
viewstate=""/>
|
||||
<broadcaster id="bcast_loadingState"
|
||||
loading="false"/>
|
||||
<broadcaster id="bcast_chromeState"
|
||||
navbar="visible"/>
|
||||
</broadcasterset>
|
||||
|
||||
<observerset id="observerset">
|
||||
@ -399,6 +401,8 @@ Desktop browser's sync prefs.
|
||||
<stack id="content-viewport">
|
||||
<observes element="bcast_windowState"
|
||||
attribute="startpage"/>
|
||||
<observes element="bcast_chromeState"
|
||||
attribute="navbar"/>
|
||||
<deck id="browsers"
|
||||
flex="1"
|
||||
observes="bcast_preciseInput"/>
|
||||
|
@ -251,10 +251,6 @@ documenttab[selected] .documenttab-selection:-moz-locale-dir(rtl) {
|
||||
|
||||
/* Start UI ----------------------------------------------------------------- */
|
||||
|
||||
#content-viewport[startpage] .active-tab-notificationbox {
|
||||
padding-bottom: @toolbar_height@;
|
||||
}
|
||||
|
||||
#urlbar-autocomplete[viewstate="snapped"],
|
||||
#urlbar-autocomplete[viewstate="portrait"]{
|
||||
-moz-box-orient: vertical;
|
||||
@ -505,6 +501,11 @@ documenttab[selected] .documenttab-selection:-moz-locale-dir(rtl) {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
#content-viewport[navbar="visible"] .active-tab-notificationbox:not([count="0"]):not([notificationsVisible="false"]) {
|
||||
padding-bottom: @toolbar_height@;
|
||||
}
|
||||
|
||||
|
||||
/* Progress meter ---------------------------------------------------------- */
|
||||
|
||||
#progress-container {
|
||||
|
Loading…
Reference in New Issue
Block a user