Skip to content

Commit 32ba6ef

Browse files
committed
fix: Fixed small QA issues, b=no-bug, c=common, compact-mode, split-view, tabs, tests
1 parent a8559f8 commit 32ba6ef

File tree

8 files changed

+197
-187
lines changed

8 files changed

+197
-187
lines changed

prefs/zen/window-sync.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# License, v. 2.0. If a copy of the MPL was not distributed with this
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

5+
- name: zen.window-sync.enabled
6+
value: true
7+
58
- name: zen.window-sync.log
69
value: false
710

src/zen/common/modules/ZenUIManager.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ window.gZenVerticalTabsManager = {
13621362
// Check if name is blank, reset if so
13631363
// Always remove, so we can always rename and if it's empty,
13641364
// it will reset to the original name anyway
1365-
if (hasChanged) {
1365+
if (hasChanged || (this._tabEdited.zenStaticLabel && newName)) {
13661366
this._tabEdited.zenStaticLabel = newName;
13671367
gBrowser._setTabLabel(this._tabEdited, newName);
13681368
gZenUIManager.showToast("zen-tabs-renamed");

src/zen/compact-mode/sidebar.inc.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#zen-dragover-background {
1313
width: calc(100% - var(--zen-toolbox-padding) * 2 - 5px);
1414
left: unset;
15+
transform: translateY(-4px);
1516
}
1617

1718
#zen-tabbox-wrapper {

src/zen/sessionstore/ZenWindowSync.sys.mjs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,11 @@ class nsZenWindowSync {
517517
*/
518518
#moveItemToMatchOriginal(aOriginalItem, aTargetItem, aWindow, { isEssential, isPinned }) {
519519
const { gBrowser, gZenWorkspaces } = aWindow;
520-
const originalSibling = aOriginalItem.previousElementSibling;
520+
let originalSibling = aOriginalItem.previousElementSibling;
521+
if (originalSibling?.classList.contains("space-fake-collapsible-start")) {
522+
// Skip space fake elements.
523+
originalSibling = originalSibling.previousElementSibling;
524+
}
521525
let isFirstTab = true;
522526
if (gBrowser.isTabGroup(originalSibling) || gBrowser.isTab(originalSibling)) {
523527
isFirstTab =

src/zen/split-view/ZenViewSplitter.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,6 +2133,8 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
21332133
const splitData = this.splitTabs(group.tabs, groupData.gridType, -1);
21342134
if (splitData) {
21352135
splitData.layoutTree = layout;
2136+
} else {
2137+
gBrowser.removeTabGroup(group);
21362138
}
21372139
}
21382140

src/zen/tabs/ZenPinnedTabManager.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
577577
}
578578

579579
movingTabs = movingTabs.filter((tab) =>
580-
gBrowser.isTabGroupLabel(tab)
581-
? tab.group?.isZenFolder && !tabsTarget && !essentialTabsTarget
580+
gBrowser.isTabGroupLabel(tab) && tab.group?.isZenFolder
581+
? !tabsTarget && !essentialTabsTarget
582582
: true
583583
);
584584

src/zen/tests/mochitests/sandbox/mac_register_font.py

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,69 +17,69 @@
1717

1818

1919
def main():
20-
parser = argparse.ArgumentParser()
21-
parser.add_argument(
22-
"-v",
23-
"--verbose",
24-
action="store_true",
25-
help="print verbose registration failures",
26-
default=False,
27-
)
28-
parser.add_argument(
29-
"file", nargs="*", help="font file to register or unregister", default=[]
30-
)
31-
parser.add_argument(
32-
"-u",
33-
"--unregister",
34-
action="store_true",
35-
help="unregister the provided fonts",
36-
default=False,
37-
)
38-
parser.add_argument(
39-
"-p",
40-
"--persist-user",
41-
action="store_true",
42-
help="permanently register the font",
43-
default=False,
44-
)
20+
parser = argparse.ArgumentParser()
21+
parser.add_argument(
22+
"-v",
23+
"--verbose",
24+
action="store_true",
25+
help="print verbose registration failures",
26+
default=False,
27+
)
28+
parser.add_argument(
29+
"file", nargs="*", help="font file to register or unregister", default=[]
30+
)
31+
parser.add_argument(
32+
"-u",
33+
"--unregister",
34+
action="store_true",
35+
help="unregister the provided fonts",
36+
default=False,
37+
)
38+
parser.add_argument(
39+
"-p",
40+
"--persist-user",
41+
action="store_true",
42+
help="permanently register the font",
43+
default=False,
44+
)
4545

46-
args = parser.parse_args()
46+
args = parser.parse_args()
4747

48-
if args.persist_user:
49-
scope = CoreText.kCTFontManagerScopeUser
50-
scopeDesc = "user"
51-
else:
52-
scope = CoreText.kCTFontManagerScopeSession
53-
scopeDesc = "session"
48+
if args.persist_user:
49+
scope = CoreText.kCTFontManagerScopeUser
50+
scopeDesc = "user"
51+
else:
52+
scope = CoreText.kCTFontManagerScopeSession
53+
scopeDesc = "session"
5454

55-
failureCount = 0
56-
for fontPath in args.file:
57-
fontURL = Cocoa.NSURL.fileURLWithPath_(fontPath)
58-
(result, error) = register_or_unregister_font(fontURL, args.unregister, scope)
59-
if result:
60-
print(
61-
"%sregistered font %s with %s scope"
62-
% (("un" if args.unregister else ""), fontPath, scopeDesc)
63-
)
64-
else:
65-
print(
66-
"Failed to %sregister font %s with %s scope"
67-
% (("un" if args.unregister else ""), fontPath, scopeDesc)
68-
)
69-
if args.verbose:
70-
print(error)
71-
failureCount += 1
55+
failureCount = 0
56+
for fontPath in args.file:
57+
fontURL = Cocoa.NSURL.fileURLWithPath_(fontPath)
58+
(result, error) = register_or_unregister_font(fontURL, args.unregister, scope)
59+
if result:
60+
print(
61+
"%sregistered font %s with %s scope"
62+
% (("un" if args.unregister else ""), fontPath, scopeDesc)
63+
)
64+
else:
65+
print(
66+
"Failed to %sregister font %s with %s scope"
67+
% (("un" if args.unregister else ""), fontPath, scopeDesc)
68+
)
69+
if args.verbose:
70+
print(error)
71+
failureCount += 1
7272

73-
sys.exit(failureCount)
73+
sys.exit(failureCount)
7474

7575

7676
def register_or_unregister_font(fontURL, unregister, scope):
77-
return (
78-
CoreText.CTFontManagerUnregisterFontsForURL(fontURL, scope, None)
79-
if unregister
80-
else CoreText.CTFontManagerRegisterFontsForURL(fontURL, scope, None)
81-
)
77+
return (
78+
CoreText.CTFontManagerUnregisterFontsForURL(fontURL, scope, None)
79+
if unregister
80+
else CoreText.CTFontManagerRegisterFontsForURL(fontURL, scope, None)
81+
)
8282

8383

8484
if __name__ == "__main__":
85-
main()
85+
main()

0 commit comments

Comments
 (0)