mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1911848 - Simplify tab drop indicator code and styling. r=frg

This commit is contained in:
Ian Neal 2024-08-06 17:09:17 +01:00
Родитель ac9383d7bf
Коммит e18e9ac498
4 изменённых файлов: 27 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

43
suite/browser/tabbrowser.xml
Просмотреть файл

@ -23,15 +23,15 @@
<content>
<xul:stringbundle anonid="tbstringbundle" src="chrome://navigator/locale/tabbrowser.properties"/>
<xul:tabbox anonid="tabbox" flex="1" eventnode="document">
<xul:hbox class="tab-drop-indicator-bar" collapsed="true">
<xul:image class="tab-drop-indicator" mousethrough="always"/>
</xul:hbox>
<xul:hbox class="tabbrowser-strip" collapsed="true" tooltip="_child" context="_child"
anonid="strip"
ondragstart="this.parentNode.parentNode._onDragStart(event);"
ondragover="this.parentNode.parentNode._onDragOver(event);"
ondrop="this.parentNode.parentNode._onDrop(event);"
ondragleave="this.parentNode.parentNode._onDragLeave(event);">
<xul:hbox align="start">
<xul:image class="tab-drop-indicator" anonid="tab-drop-indicator" collapsed="true"/>
</xul:hbox>
<xul:tooltip onpopupshowing="event.stopPropagation(); return this.parentNode.parentNode.parentNode.doPreview(this);"
onpopuphiding="this.parentNode.parentNode.parentNode.resetPreview(this);" orient="vertical">
<xul:label class="tooltip-label" crop="right"/>
@ -113,6 +113,9 @@
<field name="mTabBox" readonly="true">
document.getAnonymousElementByAttribute(this, "anonid", "tabbox");
</field>
<field name="_tabDropIndicator">
document.getAnonymousElementByAttribute(this, "anonid", "tab-drop-indicator");
</field>
<field name="mStrip" readonly="true">
document.getAnonymousElementByAttribute(this, "anonid", "strip");
</field>
@ -2454,7 +2457,7 @@
aEvent.preventDefault();
aEvent.stopPropagation();
var ib = document.getAnonymousElementByAttribute(this, "class", "tab-drop-indicator-bar");
var ind = this._tabDropIndicator;
// autoscroll the tab strip if we drag over the scroll buttons,
// even if we aren't dragging a tab
@ -2476,14 +2479,12 @@
tabStrip.scrollByPixels((ltr ? 1 : -1) * pixelsToScroll);
}
var ind = document.getAnonymousElementByAttribute(this, "class", "tab-drop-indicator");
var draggedTab = aEvent.dataTransfer.mozSourceNode;
var newIndex = this.getDropIndex(aEvent);
if (draggedTab && draggedTab.parentNode == this.tabContainer) {
let tabIndex = this.getTabIndex(draggedTab);
if (newIndex == tabIndex || newIndex == tabIndex + 1) {
ib.collapsed = true;
ind.collapsed = true;
return;
}
}
@ -2491,16 +2492,8 @@
var scrollRect = tabStrip.scrollClientRect;
var rect = this.getBoundingClientRect();
var minMargin = scrollRect.left - rect.left;
// make sure we don't place the tab drop indicator past the
// edge, or the containing box will flex and stretch
// the tab drop indicator bar, which will flex the url bar.
// XXX todo
// just use first value if you can figure out how to get
// the tab drop indicator to crop instead of flex and stretch
// the tab drop indicator bar.
var maxMargin = Math.min(minMargin + scrollRect.width,
ib.getBoundingClientRect().right -
ind.clientWidth);
scrollRect.right);
if (!ltr)
[minMargin, maxMargin] = [this.clientWidth - maxMargin,
this.clientWidth - minMargin];
@ -2530,9 +2523,15 @@
newMargin = maxMargin;
}
ind.style.marginInlineStart = newMargin + "px";
ind.collapsed = false;
ib.collapsed = false;
newMargin += ind.clientWidth / 2;
if (!ltr)
newMargin *= -1;
ind.style.MozTransform = "translate(" + Math.round(newMargin) + "px)";
ind.style.marginInlineStart = (-ind.clientWidth) + "px";
ind.style.marginTop = (-ind.clientHeight) + "px";
]]>
</body>
</method>
@ -2541,9 +2540,7 @@
<parameter name="aEvent"/>
<body>
<![CDATA[
document.getAnonymousElementByAttribute(this, "class",
"tab-drop-indicator-bar")
.collapsed = true;
this._tabDropIndicator.collapsed = true;
aEvent.stopPropagation();
var newIndex = this.getDropIndex(aEvent);
@ -2625,9 +2622,7 @@
if (target)
return;
document.getAnonymousElementByAttribute(this, "class",
"tab-drop-indicator-bar")
.collapsed = true;
this._tabDropIndicator.collapsed = true;
aEvent.stopPropagation();
]]>
</body>

12
suite/themes/classic/mac/navigator/tabbrowser.css
Просмотреть файл

@ -218,18 +218,10 @@ tabpanels {
list-style-image: url("chrome://navigator/skin/icons/tab-new.png");
}
.tab-drop-indicator-bar {
height: 11px;
margin-top: -11px;
margin-inline-start: -6px;
position: relative;
}
.tab-drop-indicator {
height: 11px;
width: 11px;
margin-bottom: -5px;
margin-top: -8px !important;
position: relative;
z-index: 1;
list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
}

15
suite/themes/classic/navigator/tabbrowser.css
Просмотреть файл

@ -178,19 +178,10 @@ tabpanels {
list-style-image: url("chrome://navigator/skin/icons/tab-new.png");
}
.tab-drop-indicator-bar {
height: 11px;
margin-top: -11px;
margin-inline-start: -6px;
position: relative;
}
.tab-drop-indicator {
height: 11px;
width: 11px;
margin-bottom: -5px;
position: relative;
list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
position: relative;
z-index: 1;
list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
}
tooltip[tabpreview="true"] {

15
suite/themes/modern/navigator/tabbrowser.css
Просмотреть файл

@ -139,17 +139,8 @@ tab[busy] {
list-style-image: url("chrome://navigator/skin/icons/tab-new-act.png");
}
.tab-drop-indicator-bar {
height: 11px;
margin-top: -11px;
margin-inline-start: -6px;
position: relative;
}
.tab-drop-indicator {
height: 11px;
width: 11px;
margin-bottom: -5px;
position: relative;
list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
position: relative;
z-index: 1;
list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
}