wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2024-05-08 10:05:44 +08:00
commit 390799012c
25 changed files with 690 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

8
layout/base/nsLayoutUtils.cpp
View file

@ -4726,8 +4726,8 @@ GetDefiniteSizeTakenByBoxSizing(StyleBoxSizing aBoxSizing,
}
// Handles only max-content and min-content, and
// -moz-fit-content for min-width and max-width, since the others
// (-moz-fit-content for width, and -moz-available) have no effect on
// fit-content for min-width and max-width, since the others
// (fit-content for width, and -moz-available) have no effect on
// intrinsic widths.
enum eWidthProperty { PROP_WIDTH, PROP_MAX_WIDTH, PROP_MIN_WIDTH };
static bool
@ -5038,7 +5038,7 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis aAxis,
if (styleISize.GetUnit() == eStyleUnit_Enumerated &&
(styleISize.GetIntValue() == NS_STYLE_WIDTH_MAX_CONTENT ||
styleISize.GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT)) {
// -moz-fit-content and -moz-available enumerated widths compute intrinsic
// fit-content and -moz-available enumerated widths compute intrinsic
// widths just like auto.
// For max-content and min-content, we handle them like
// specified widths, but ignore box-sizing.
@ -5054,7 +5054,7 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis aAxis,
++gNoiseIndent;
#endif
if (aType != MIN_ISIZE) {
// At this point, |styleISize| is auto/-moz-fit-content/-moz-available or
// At this point, |styleISize| is auto/fit-content/-moz-available or
// has a percentage. The intrinisic size for those under a max-content
// constraint is the max-content contribution which we shouldn't clamp.
aMarginBoxMinSizeClamp = NS_MAXSIZE;

6
layout/base/nsPresShell.cpp
View file

@ -8063,6 +8063,12 @@ PresShell::HandleEventInternal(WidgetEvent* aEvent,
aEvent->mFlags.mDefaultPreventedByChrome) {
mIsLastChromeOnlyEscapeKeyConsumed = true;
}
if (aEvent->mMessage == eKeyDown &&
!aEvent->mFlags.mDefaultPrevented) {
if (nsIDocument* doc = GetDocument()) {
doc->TryCancelDialog();
}
}
}
}
break;