зеркало из https://github.com/mozilla/gecko-dev.git
bug 456390 – move control strip buttons into position. r=mfinkle
This commit is contained in:
Родитель
6b65d5b781
Коммит
484bed9b35
|
@ -384,6 +384,8 @@ var BrowserUI = {
|
||||||
var rect = document.getElementById("browser-container").getBoundingClientRect();
|
var rect = document.getElementById("browser-container").getBoundingClientRect();
|
||||||
var containerW = rect.right - rect.left;
|
var containerW = rect.right - rect.left;
|
||||||
var containerH = rect.bottom - rect.top;
|
var containerH = rect.bottom - rect.top;
|
||||||
|
var toolbar = document.getElementById("toolbar-main");
|
||||||
|
var toolbarH = toolbar.boxObject.height;
|
||||||
|
|
||||||
var browser = document.getElementById("browser");
|
var browser = document.getElementById("browser");
|
||||||
browser.width = containerW;
|
browser.width = containerW;
|
||||||
|
@ -396,14 +398,13 @@ var BrowserUI = {
|
||||||
tabbar.left = -tabbar.boxObject.width;
|
tabbar.left = -tabbar.boxObject.width;
|
||||||
panelUI.left = containerW + sidebar.boxObject.width;
|
panelUI.left = containerW + sidebar.boxObject.width;
|
||||||
sidebar.left = containerW;
|
sidebar.left = containerW;
|
||||||
sidebar.height = panelUI.height = tabbar.height = containerH;
|
sidebar.height = tabbar.height = (panelUI.height = containerH) - toolbarH;
|
||||||
}
|
}
|
||||||
panelUI.width = containerW - sidebar.boxObject.width - tabbar.boxObject.width;
|
panelUI.width = containerW - sidebar.boxObject.width - tabbar.boxObject.width;
|
||||||
|
|
||||||
var toolbar = document.getElementById("toolbar-main");
|
|
||||||
var popup = document.getElementById("popup_autocomplete");
|
var popup = document.getElementById("popup_autocomplete");
|
||||||
toolbar.width = containerW;
|
toolbar.width = containerW;
|
||||||
popup.height = containerH - toolbar.boxObject.height;
|
popup.height = containerH - toolbarH;
|
||||||
},
|
},
|
||||||
|
|
||||||
init : function() {
|
init : function() {
|
||||||
|
|
|
@ -217,9 +217,10 @@
|
||||||
</toolbar>
|
</toolbar>
|
||||||
|
|
||||||
<vbox id="browser-controls" style="-moz-stack-sizing: ignore;" top="60" left="0">
|
<vbox id="browser-controls" style="-moz-stack-sizing: ignore;" top="60" left="0">
|
||||||
|
<toolbarbutton id="tool-star" class="browser-control-button" command="cmd_star"/>
|
||||||
<toolbarbutton id="tool-back" class="browser-control-button" command="cmd_back"/>
|
<toolbarbutton id="tool-back" class="browser-control-button" command="cmd_back"/>
|
||||||
<toolbarbutton id="tool-forward" class="browser-control-button" command="cmd_forward"/>
|
<toolbarbutton id="tool-forward" class="browser-control-button" command="cmd_forward"/>
|
||||||
<toolbarbutton id="tool-star" class="browser-control-button" command="cmd_star"/>
|
<toolbarspring/>
|
||||||
<toolbarbutton id="tool-actions" class="browser-control-button" command="cmd_actions"/>
|
<toolbarbutton id="tool-actions" class="browser-control-button" command="cmd_actions"/>
|
||||||
<toolbarbutton id="tool-prefs" class="browser-control-button" command="cmd_panel"/>
|
<toolbarbutton id="tool-prefs" class="browser-control-button" command="cmd_panel"/>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче