Skip to content

Commit 38aeddd

Browse files
piroorpiroor
committed
Use more meaningful name
1 parent 7ebefb5 commit 38aeddd

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

‎webextensions/background/migration.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function log(...args) {
2222
internalLogger('background/migration', ...args);
2323
}
2424

25-
const kCONFIGS_VERSION = 25;
25+
const kCONFIGS_VERSION = 26;
2626
const kFEATURES_VERSION = 9;
2727

2828
export function migrateConfigs() {
@@ -256,6 +256,10 @@ export function migrateConfigs() {
256256
configs.tabBunchesDetectionTimeout = configs.autoGroupNewTabsTimeout;
257257
if (configs.autoGroupNewTabsDelayOnNewWindow !== null)
258258
configs.tabBunchesDetectionDelayOnNewWindow = configs.autoGroupNewTabsDelayOnNewWindow;
259+
260+
case 25:
261+
if (configs.autoHiddenScrollbarPlaceholderSize !== null)
262+
configs.shiftTabsForScrollbarDistance = configs.autoHiddenScrollbarPlaceholderSize;
259263
}
260264
configs.configsVersion = kCONFIGS_VERSION;
261265
}

‎webextensions/common/common.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ export const configs = new Configs({
9595
iconColor: 'auto',
9696
indentLine: 'auto',
9797

98-
autoHiddenScrollbarPlaceholderSize: '0.5em',
99-
applyAutoHiddenScrollbarPlaceholderOnlyOnHover: true,
98+
shiftTabsForScrollbarDistance: '0.5em',
99+
shiftTabsForScrollbarOnlyOnHover: true,
100100

101101
unrepeatableBGImageAspectRatio: 4,
102102

@@ -530,6 +530,7 @@ export const configs = new Configs({
530530
userStyleRules7: '',
531531
autoGroupNewTabsTimeout: null, // migrated to tabBunchesDetectionTimeout
532532
autoGroupNewTabsDelayOnNewWindow: null, // migrated to tabBunchesDetectionDelayOnNewWindow
533+
autoHiddenScrollbarPlaceholderSize: null, // migrated to shiftTabsForScrollbarDistance
533534

534535

535536
configsVersion: 0,

‎webextensions/sidebar/mouse-event-listener.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ TSTAPI.onUnregistered.addListener(() => {
119119

120120
configs.$addObserver(changedKey => {
121121
switch (changedKey) {
122-
case 'autoHiddenScrollbarPlaceholderSize':
123-
case 'applyAutoHiddenScrollbarPlaceholderOnlyOnHover':
122+
case 'shiftTabsForScrollbarDistance':
123+
case 'shiftTabsForScrollbarOnlyOnHover':
124124
updateSpecialEventListenersForAPIListeners();
125125
break;
126126
}
@@ -129,7 +129,7 @@ configs.$addObserver(changedKey => {
129129
function updateSpecialEventListenersForAPIListeners() {
130130
const shouldListenMouseMove = (
131131
TSTAPI.hasListenerForMessageType(TSTAPI.kNOTIFY_TAB_MOUSEMOVE) ||
132-
(configs.applyAutoHiddenScrollbarPlaceholderOnlyOnHover &&
132+
(configs.shiftTabsForScrollbarOnlyOnHover &&
133133
mTabBar.classList.contains(Constants.kTABBAR_STATE_SCROLLBAR_AUTOHIDE))
134134
);
135135
if (shouldListenMouseMove != onMouseMove.listening) {
@@ -168,7 +168,7 @@ function onMouseMove(event) {
168168
const twistyRect = tab && tab.$TST.element.twisty.getBoundingClientRect();
169169
const faviconRect = tab && tab.$TST.element.favicon.getBoundingClientRect();
170170
const closeRect = tab && tab.$TST.element.closeBox.getBoundingClientRect();
171-
const placeholderSizeRect = document.querySelector('#dummy-auto-hidden-scrollbar-placeholder-size-box').getBoundingClientRect();
171+
const placeholderSizeRect = document.querySelector('#dummy-shift-tabs-for-scrollbar-distance-box').getBoundingClientRect();
172172
const isRightSide = document.documentElement.classList.contains('right');
173173
const leftAreaSize = tab && (
174174
isRightSide ? closeRect.width :

‎webextensions/sidebar/sidebar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
<div id="tab-drag-notification"><span></span></div>
106106
<div id="background"></div><!-- This is required to hide dummy elements without offscreen rendering outside of the viewport. See also: https://github.com/piroor/treestyletab/issues/1703#issuecomment-354646405 -->
107107
<ul id="dummy-tabs">
108-
<span id="dummy-auto-hidden-scrollbar-placeholder-size-box"></span>
109108
<span id="dummy-favicon-size-box"></span>
110109
<span id="dummy-tab-color-box"></span>
111110
<span id="dummy-highlight-color-box"></span>
111+
<span id="dummy-shift-tabs-for-scrollbar-distance-box"></span>
112112
<span class="throbber"><span id="sync-throbber"></span></span>
113113
<tab-item id="dummy-tab" class="tab">
114114
<span class="extra-items-container indent"></span>

‎webextensions/sidebar/sidebar.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export async function init() {
240240
onConfigChange('sidebarPosition');
241241
onConfigChange('showContextualIdentitiesSelector');
242242
onConfigChange('showNewTabActionSelector');
243-
onConfigChange('applyAutoHiddenScrollbarPlaceholderOnlyOnHover');
243+
onConfigChange('shiftTabsForScrollbarOnlyOnHover');
244244

245245
document.addEventListener('focus', onFocus);
246246
document.addEventListener('blur', onBlur);
@@ -974,11 +974,11 @@ async function onConfigChange(changedKey) {
974974
mReloadMaskImage = configs[changedKey];
975975
break;
976976

977-
case 'autoHiddenScrollbarPlaceholderSize':
977+
case 'shiftTabsForScrollbarDistance':
978978
Size.update();
979979
break;
980980

981-
case 'applyAutoHiddenScrollbarPlaceholderOnlyOnHover':
981+
case 'shiftTabsForScrollbarOnlyOnHover':
982982
document.documentElement.classList.toggle('shift-tabs-for-scrollbar-only-on-hover', !!configs[changedKey]);
983983
break;
984984

‎webextensions/sidebar/size.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export function update() {
8181
--out-of-view-tab-notify-duration: ${configs.outOfViewTabNotifyDuration}ms;
8282
--visual-gap-hover-animation-delay: ${configs.cancelGapSuppresserHoverDelay}ms;
8383
84-
--scrollbar-placeholder-size: ${configs.autoHiddenScrollbarPlaceholderSize};
84+
--shift-tabs-for-scrollbar-distance: ${configs.shiftTabsForScrollbarDistance};
8585
}`;
8686
}
8787

‎webextensions/sidebar/styles/base.css‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,8 @@ ul {
297297
color: HighlightText;
298298
}
299299

300-
#dummy-auto-hidden-scrollbar-placeholder-size-box {
301-
height: var(--scrollbar-placeholder-size, 0);
302-
width: var(--scrollbar-placeholder-size, 0);
300+
#dummy-shift-tabs-for-scrollbar-distance-box {
301+
width: var(--shift-tabs-for-scrollbar-distance, 0);
303302
}
304303

305304

@@ -340,19 +339,19 @@ tab-item-substance {
340339
}
341340

342341
/* auto-hidden scrollbar placeholder workaround */
343-
:root.left.on-scrollbar-area:hover #tabbar.overflow.scrollbar-autohide tab-item:not(.pinned) tab-item-substance,
342+
:root.left.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover #tabbar.overflow.scrollbar-autohide tab-item:not(.pinned) tab-item-substance,
344343
:root.left:not(.shift-tabs-for-scrollbar-only-on-hover) #tabbar.overflow.scrollbar-autohide tab-item:not(.pinned) tab-item-substance {
345-
margin-left: calc(var(--tab-margin-left) + var(--tab-indent) + var(--scrollbar-placeholder-size));
344+
margin-left: calc(var(--tab-margin-left) + var(--tab-indent) + var(--shift-tabs-for-scrollbar-distance));
346345
}
347346

348347
:root.right tab-item:not(.pinned) tab-item-substance {
349348
margin-right: calc(var(--tab-margin-right) + var(--tab-indent));
350349
}
351350

352351
/* auto-hidden scrollbar placeholder workaround */
353-
:root.right.on-scrollbar-area:hover #tabbar.overflow.scrollbar-autohide tab-item:not(.pinned) tab-item-substance,
352+
:root.right.shift-tabs-for-scrollbar-only-on-hover.on-scrollbar-area:hover #tabbar.overflow.scrollbar-autohide tab-item:not(.pinned) tab-item-substance,
354353
:root.right:not(.shift-tabs-for-scrollbar-only-on-hover) #tabbar.overflow.scrollbar-autohide tab-item:not(.pinned) tab-item-substance {
355-
margin-right: calc(var(--tab-margin-right) + var(--tab-indent) + var(--scrollbar-placeholder-size));
354+
margin-right: calc(var(--tab-margin-right) + var(--tab-indent) + var(--shift-tabs-for-scrollbar-distance));
356355
}
357356

358357
tab-item,
@@ -459,7 +458,7 @@ tab-item .extra-items-container.indent {
459458
}
460459
/* auto-hidden scrollbar placeholder workaround */
461460
#tabbar.overflow.scrollbar-autohide tab-item .extra-items-container.indent{
462-
width: calc(var(--tab-indent) + var(--scrollbar-placeholder-size));
461+
width: calc(var(--tab-indent) + var(--shift-tabs-for-scrollbar-distance));
463462
}
464463
:root.left tab-item .extra-items-container.indent {
465464
right: auto;

0 commit comments

Comments
 (0)