Skip to content

make tabs fill up tab bar space in multiline mode #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
redyoshi49q wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make tabs fill up tab bar space in multiline mode #427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/content/tabkit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6443,9 +6443,13 @@
const tabbarPosition = _prefs.getIntPref("tabbarPosition")
let needsDisabling = false
let availWidth = 0
let visibleTabs = 0
let tabsPerRow = 1 // this avoids the risk of a divide by zero getting introduced
let rows = 0
let minWidth = null as null | number
let needsScrolling = false
const tabHorizontalBorders = 11
// in a more ideal world, tab border size would be queried from the browser environment

// region close button visibility

Expand Down Expand Up @@ -6481,7 +6485,9 @@
// visibleTabs++ // Treat the new tab button as a tab for our purposes
minWidth = _prefs.getIntPref("tabs.tabMinWidth")
availWidth = _tabContainer.mTabstrip._scrollbox.boxObject.width
const tabsPerRow = Math.floor(availWidth / Math.max(minWidth, TAB_MIN_WIDTH)) //Minimum minWidth of tab is 100, a built-in CSS rule
tabsPerRow = Math.max(Math.floor(availWidth /
(Math.max(minWidth, TAB_MIN_WIDTH) + tabHorizontalBorders)), 1)
// Minimum minWidth of tab is 100, a built-in CSS rule
rows = Math.ceil(visibleTabs / tabsPerRow)
}
if (rows > 1) {
Expand Down Expand Up @@ -6512,6 +6518,16 @@
tk.debug("Oops, the scrollbar hasn't been created yet... TODO-P6: TJS use a timeout")
availWidth -= 22
}

// the scrollbar takes up some of the space allocated to tabs, so the
// presence of one might cause the number of tabs per row to change,
// which in turn means a recalculation is necessary to account for that

tabsPerRow = Math.max(Math.floor(availWidth /
(Math.max(minWidth, TAB_MIN_WIDTH) + tabHorizontalBorders)), 1)
// Minimum minWidth of tab is 100, a built-in CSS rule
rows = Math.ceil(visibleTabs / tabsPerRow)

}
else {
_tabContainer.removeAttribute("multirowscroll")
Expand All @@ -6520,8 +6536,8 @@
_tabContainer.mTabstrip.style.setProperty("max-height", 24 * rows + "px", "important")
}

tk.setTabMinWidth(minWidth)
// tk.setTabMinWidth(availWidth / tabsPerRow)
// tk.setTabMinWidth(minWidth)
tk.setTabMinWidth(Math.floor(availWidth / tabsPerRow))

if (rows > maxRows)
tk.multiRow_onTabSelect() // Check if we need to scroll
Expand Down