Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 240485 - Bookmarks Toolbar items go under the 'chevron' icon, when interface is RTL, original patch by Asaf Romano (bugs.mano@mail-central.com), rewritten by me, landing on trunk finally

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@158770 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mconnor%myrealbox.com 2004-07-06 00:14:30 +00:00
parent 03c2a12496
commit 1fb16d16bb
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/browser/components/bookmarks/content/bookmarksMenu.js
View File

@ -318,14 +318,20 @@ var BookmarksMenu = {
else
border = size/2;
var dropLocation;
// in the first region?
if (clientCoordValue-coordValue < border)
return BookmarksUtils.DROP_BEFORE;
dropLocation = BookmarksUtils.DROP_BEFORE;
// in the last region?
if (clientCoordValue-coordValue >= size-border)
return BookmarksUtils.DROP_AFTER;
// must be in the middle somewhere
return BookmarksUtils.DROP_ON;
else if (clientCoordValue-coordValue >= size-border)
dropLocation = BookmarksUtils.DROP_AFTER;
else // must be in the middle somewhere
return BookmarksUtils.DROP_ON
// If the direction of PersonalToolbar is RTL, we invert dropLocation before returning
if (window.getComputedStyle(document.getElementById("PersonalToolbar"),'').direction == 'rtl')
dropLocation = -dropLocation;
return dropLocation;
},
/////////////////////////////////////////////////////////////////////////
@ -872,21 +878,27 @@ var BookmarksToolbar =
chevron.collapsed = true;
var overflowed = false;
var isLTR=window.getComputedStyle(document.getElementById("PersonalToolbar"),'').direction=='ltr';
for (var i=0; i<buttons.childNodes.length; i++) {
var button = buttons.childNodes[i];
button.collapsed = overflowed;
if (i == buttons.childNodes.length - 1) // last ptf item...
chevronWidth = 0;
if (button.boxObject.x + button.boxObject.width + chevronWidth > width) {
overflowed = true;
var offset = isLTR ? button.boxObject.x
: width - button.boxObject.x;
if (offset + button.boxObject.width + chevronWidth > width) {
overflowed = true;
// This button doesn't fit. Show it in the menu. Hide it in the toolbar.
if (!button.collapsed)
button.collapsed = true;
if (chevron.collapsed) {
chevron.collapsed = false;
var overflowPadder = document.getElementById("overflow-padder");
overflowPadder.width = width - chevron.boxObject.width - buttons.boxObject.x;
offset = isLTR ? buttons.boxObject.x
: width - buttons.boxObject.x - buttons.boxObject.width;
overflowPadder.width = width - chevron.boxObject.width - offset;
}
}
}