Skip to content

Commit dfe932a

Browse files
committed
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
2 parents a61b077 + f36b84d commit dfe932a

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

src/zen/common/ZenActorsManager.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ let JSWINDOWACTORS = {
4242
esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
4343
events: {
4444
DOMContentLoaded: {},
45-
click: {
45+
mousedown: {
4646
capture: true,
4747
},
4848
keydown: {

src/zen/folders/ZenFolders.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@
11561156
let dragDownThreshold =
11571157
Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100;
11581158

1159-
const dropElementGroup = dropElement;
1159+
const dropElementGroup = dropElement?.isZenFolder ? dropElement : dropElement?.group;
11601160
const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group');
11611161
let firstGroupElem =
11621162
dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling;

src/zen/glance/actors/ZenGlanceChild.sys.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ export class ZenGlanceChild extends JSWindowActorChild {
3535
}
3636

3737
#sendClickDataToParent(target, element) {
38-
if (!element || !target) {
38+
if (!element && !target) {
3939
return;
4040
}
41+
if (!target) {
42+
target = element;
43+
}
4144
// Get the largest element we can get. If the `A` element
4245
// is a parent of the original target, use the anchor element,
4346
// otherwise use the original target.
@@ -54,7 +57,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
5457
});
5558
}
5659

57-
on_click(event) {
60+
on_mousedown(event) {
5861
// get closest A element
5962
const target = event.target.closest('A');
6063
const elementToRecord = event.originalTarget || event.target;

src/zen/tabs/zen-tabs/vertical-tabs.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,13 @@
329329
scale: 0.92;
330330
}
331331

332+
&:not(:hover) {
333+
.tab-close-button,
334+
.tab-reset-button {
335+
display: none !important;
336+
}
337+
}
338+
332339
& .tab-icon-image {
333340
&:not([src]),
334341
&:-moz-broken {

src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
id<NSHapticFeedbackPerformer> performer = [NSHapticFeedbackManager defaultPerformer];
2525
[performer performFeedbackPattern:NSHapticFeedbackPatternAlignment
2626
performanceTime:NSHapticFeedbackPerformanceTimeDefault];
27-
} else {
28-
// Fallback on earlier versions
29-
// Note: This is a no-op on older versions of iOS/macOS
3027
}
3128
return NS_OK;
3229
NS_OBJC_END_TRY_BLOCK_RETURN(NS_OK);

0 commit comments

Comments
 (0)