Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 677670 - Make the new tab popup work on tablets. r=mbrubeck

Browse Source
This commit is contained in:
Wes Johnston 2011-09-26 18:28:54 -07:00
parent 2f3a022d97
commit 613085c85b
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/chrome/content/bindings/arrowbox.xml
View File

@ -118,7 +118,11 @@
if (vertPos == 0) {
hideArrow = true;
} else {
arrowbox.style.marginLeft = ((targetRect.left - popupRect.left) + (targetRect.width / 2) - HALF_ARROW_WIDTH) + "px";
let anchorPosX = 0.5;
// check for hasAttribute because, in some cases, anchorNode is actually a rect
if (this.anchorNode && this.anchorNode.hasAttribute && this.anchorNode.hasAttribute("anchorPosX"))
anchorPosX = parseFloat(this.anchorNode.getAttribute("anchorPosX")) || 0.5;
arrowbox.style.marginLeft = ((targetRect.left - popupRect.left) + (targetRect.width * anchorPosX) - HALF_ARROW_WIDTH) + "px";
if (vertPos == 1) {
container.dir = "normal";
anchorClass = "top";
@ -130,7 +134,11 @@
} else if (vertPos == 0) {
container.orient = "";
arrowbox.orient = "vertical";
arrowbox.style.marginTop = ((targetRect.top - popupRect.top) + (targetRect.height / 2) - HALF_ARROW_WIDTH) + "px";
let anchorPosY = 0.5;
// check for hasAttribute because, in some cases, anchorNode is actually a rect
if (this.anchorNode && this.anchorNode.hasAttribute && this.anchorNode.hasAttribute("anchorPosY"))
anchorPosY = parseFloat(this.anchorNode.getAttribute("anchorPosY")) || 0.5;
arrowbox.style.marginTop = ((targetRect.top - popupRect.top) + (targetRect.height * anchorPosY) - HALF_ARROW_WIDTH) + "px";
if (horizPos == 1) {
container.dir = "ltr";
anchorClass = "left";

2
mobile/chrome/content/browser.xul
View File

@ -221,7 +221,7 @@
<box id="toolbar-container" class="panel-dark toolbar-height">
<box id="toolbar-moveable-container" observes="bcast_uidiscovery">
<toolbar id="toolbar-main" class="panel-dark viewable-width" observes="bcast_urlbarState">
<toolbarbutton id="tool-tabs" class="button-actionbar" command="cmd_showTabs"/>
<toolbarbutton id="tool-tabs" class="button-actionbar" command="cmd_showTabs" anchorPosX="0.3"/>
<toolbarbutton id="tool-back2" class="tool-back button-actionbar" command="cmd_back"/>
<toolbarbutton id="tool-forward2" class="tool-forward button-actionbar" command="cmd_forward"/>
#ifdef MOZ_PLATFORM_MAEMO

8
mobile/chrome/content/common-ui.js
View File

@ -201,6 +201,9 @@ var NewTabPopup = {
},
show: function nt_show(aTab) {
if (Util.isTablet() && TabsPopup.visible)
return;
BrowserUI.pushPopup(this, this.box);
this._tabs.push(aTab);
@ -219,7 +222,10 @@ var NewTabPopup = {
// being anchored to might be overflowing the tabs
// scrollbox which confuses the dynamic arrow direction
// calculation (see bug 662520).
if (Elements.tabList.getBoundingClientRect().left < 0)
if (Util.isTablet()) {
let toolbarbutton = document.getElementById("tool-tabs");
this.box.anchorTo(toolbarbutton, "after_start");
} else if (Elements.tabList.getBoundingClientRect().left < 0)
this.box.pointLeftAt(aTab);
else
this.box.pointRightAt(aTab);

3
mobile/themes/core/honeycomb/platform.css
View File

@ -580,8 +580,7 @@ dialog,
background: @color_background_default@;
}
dialog,
.arrowbox-dark .panel-arrowcontent {
dialog {
border: @border_width_small@ solid @color_dialog_border@;
box-shadow: 0 0 @shadow_width_tiny@ @shadow_width_medium@ @color_shadow_light@;
}