зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1760276 [Wayland] Avoid to use move-to-rect when possible r=emilio
Due to move-to-rect limitations (https://gitlab.gnome.org/GNOME/gtk/-/issues/1986) we try to avoid it when it's possible. - Use plain popup resize/movement when popup is places inside of application toplevel window. - Hide moved/scaled popup window only when move-to-rect is used. - Clear mMoveToRectPopupRect before any move/resize and use Wayland compositor to place/size the window. Differential Revision: https://phabricator.services.mozilla.com/D141601
This commit is contained in:
stransky
Родитель
ba683562a8
Коммит
8eca77b9dc
|
|
@ -1031,6 +1031,7 @@ void nsWindow::Move(double aX, double aY) {
|
|||
}
|
||||
|
||||
if (IsWaylandPopup()) {
|
||||
// TODO: Do we need this?
|
||||
auto prefBounds = mMoveToRectPopupRect;
|
||||
if (prefBounds.TopLeft() != mBounds.TopLeft()) {
|
||||
NativeMoveResize(/* move */ true, /* resize */ false);
|
||||
|
|
@ -1370,14 +1371,11 @@ void nsWindow::WaylandPopupHierarchyValidateByLayout(
|
|||
void nsWindow::WaylandPopupHierarchyHideTemporary() {
|
||||
LOG("nsWindow::WaylandPopupHierarchyHideTemporary() [%p]", this);
|
||||
nsWindow* popup = WaylandPopupFindLast(this);
|
||||
while (popup) {
|
||||
while (popup && popup != this) {
|
||||
LOG(" temporary hidding popup [%p]", popup);
|
||||
nsWindow* prev = popup->mWaylandPopupPrev;
|
||||
popup->HideWaylandPopupWindow(/* aTemporaryHide */ true,
|
||||
/* aRemoveFromPopupList */ false);
|
||||
if (popup == this) {
|
||||
break;
|
||||
}
|
||||
popup = prev;
|
||||
}
|
||||
}
|
||||
|
|
@ -1777,21 +1775,36 @@ void nsWindow::UpdateWaylandPopupHierarchy() {
|
|||
|
||||
nsWindow* popup = changedPopup;
|
||||
while (popup) {
|
||||
// We can use move_to_rect only when popups in popup hierarchy matches
|
||||
// layout hierarchy as move_to_rect request that parent/child
|
||||
// popups are adjacent.
|
||||
bool useMoveToRect = gUseMoveToRect && popup->mPopupMatchesLayout;
|
||||
if (useMoveToRect) {
|
||||
const bool useMoveToRect = [&] {
|
||||
if (!gUseMoveToRect) {
|
||||
return false; // Not available.
|
||||
}
|
||||
if (!popup->mPopupMatchesLayout) {
|
||||
// We can use move_to_rect only when popups in popup hierarchy matches
|
||||
// layout hierarchy as move_to_rect request that parent/child
|
||||
// popups are adjacent.
|
||||
return false;
|
||||
}
|
||||
// We use move_to_rect when:
|
||||
// - Popup is tooltip
|
||||
// - Popup is anchored, i.e. it has an anchor defined by layout
|
||||
// (mPopupAnchored).
|
||||
// - Popup isn't anchored but it has toplevel as parent, i.e.
|
||||
// it's first popup.
|
||||
useMoveToRect = (mPopupType == ePopupTypeTooltip) ||
|
||||
(popup->mPopupAnchored ||
|
||||
(!popup->mPopupAnchored &&
|
||||
popup->mWaylandPopupPrev->mWaylandToplevel == nullptr));
|
||||
}
|
||||
bool useIt = mPopupType == ePopupTypeTooltip || popup->mPopupAnchored ||
|
||||
!popup->mWaylandPopupPrev->mWaylandToplevel;
|
||||
if (!useIt) {
|
||||
return false;
|
||||
}
|
||||
if (WaylandPopupFitsToplevelWindow()) {
|
||||
// Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/1986
|
||||
// Bug 1760276 - don't use move-to-rect when popup is inside main
|
||||
// Firefox window.
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}();
|
||||
|
||||
LOG(" popup [%p] matches layout [%d] anchored [%d] first popup [%d] use "
|
||||
"move-to-rect %d\n",
|
||||
popup, popup->mPopupMatchesLayout, popup->mPopupAnchored,
|
||||
|
|
@ -1820,31 +1833,60 @@ static void NativeMoveResizeCallback(GdkWindow* window,
|
|||
wnd->NativeMoveResizeWaylandPopupCallback(final_rect, flipped_x, flipped_y);
|
||||
}
|
||||
|
||||
// When popup is repositioned by widget code, we need to notify
|
||||
// layout about it. It's because we control popup placement
|
||||
// on widget on Wayland so layout may have old popup size/coordinates.
|
||||
void nsWindow::WaylandPopupPropagateChangesToLayout(bool aMove, bool aResize) {
|
||||
LOG("nsWindow::WaylandPopupPropagateChangesToLayout()");
|
||||
|
||||
// Update view
|
||||
if (aResize) {
|
||||
LOG(" needSizeUpdate\n");
|
||||
if (nsMenuPopupFrame* popupFrame = GetMenuPopupFrame(GetFrame())) {
|
||||
RefPtr<PresShell> presShell = popupFrame->PresShell();
|
||||
presShell->FrameNeedsReflow(popupFrame, IntrinsicDirty::Resize,
|
||||
NS_FRAME_IS_DIRTY);
|
||||
// Force to trigger popup crop to fit the screen
|
||||
popupFrame->SetPopupPosition(nullptr, true, false);
|
||||
}
|
||||
}
|
||||
if (aMove) {
|
||||
LOG(" needPositionUpdate, bounds [%d, %d]", mBounds.x, mBounds.y);
|
||||
NotifyWindowMoved(mBounds.x, mBounds.y);
|
||||
if (nsMenuPopupFrame* popupFrame = GetMenuPopupFrame(GetFrame())) {
|
||||
auto p = CSSIntPoint::Round(
|
||||
mBounds.TopLeft() / popupFrame->PresContext()->CSSToDevPixelScale());
|
||||
popupFrame->MoveTo(p, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void nsWindow::NativeMoveResizeWaylandPopupCallback(
|
||||
const GdkRectangle* aFinalSize, bool aFlippedX, bool aFlippedY) {
|
||||
mWaitingForMoveToRectCallback = false;
|
||||
|
||||
bool moved = mNewBoundsAfterMoveToRect.x || mNewBoundsAfterMoveToRect.y;
|
||||
bool resized =
|
||||
bool movedByLayout =
|
||||
mNewBoundsAfterMoveToRect.x || mNewBoundsAfterMoveToRect.y;
|
||||
bool resizedByLayout =
|
||||
mNewBoundsAfterMoveToRect.width || mNewBoundsAfterMoveToRect.height;
|
||||
|
||||
if (moved || resized) {
|
||||
// Popup was moved between move-to-rect call and move-to-rect callback
|
||||
// and the coordinates from move-to-rect callback are outdated.
|
||||
if (movedByLayout || resizedByLayout) {
|
||||
LOG(" Another move/resize called during waiting for callback\n");
|
||||
|
||||
// Set mMoveToRectPopupRect to zero.
|
||||
// Popup was moved between move-to-rect call and move-to-rect callback
|
||||
// and the coordinates from move-to-rect callback are outdated.
|
||||
mMoveToRectPopupRect = LayoutDeviceIntRect();
|
||||
if (moved) {
|
||||
if (movedByLayout) {
|
||||
mBounds.x = mNewBoundsAfterMoveToRect.x;
|
||||
mBounds.y = mNewBoundsAfterMoveToRect.y;
|
||||
}
|
||||
if (resized) {
|
||||
if (resizedByLayout) {
|
||||
mBounds.width = mNewBoundsAfterMoveToRect.width;
|
||||
mBounds.height = mNewBoundsAfterMoveToRect.height;
|
||||
}
|
||||
mNewBoundsAfterMoveToRect = LayoutDeviceIntRect(0, 0, 0, 0);
|
||||
NativeMoveResize(moved, resized);
|
||||
|
||||
// Fire another round of move/resize to reflect latest request
|
||||
// from layout.
|
||||
NativeMoveResize(movedByLayout, resizedByLayout);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1866,22 +1908,9 @@ void nsWindow::NativeMoveResizeWaylandPopupCallback(
|
|||
// We're going to reuse it in layout code if popup is moved.
|
||||
mMoveToRectPopupRect = newBounds;
|
||||
|
||||
const bool needsPositionUpdate = newBounds.TopLeft() != mBounds.TopLeft();
|
||||
const bool needsSizeUpdate = newBounds.Size() != mBounds.Size();
|
||||
bool needsPositionUpdate = newBounds.TopLeft() != mBounds.TopLeft();
|
||||
bool needsSizeUpdate = newBounds.Size() != mBounds.Size();
|
||||
|
||||
// Update view
|
||||
if (needsSizeUpdate) {
|
||||
LOG(" needSizeUpdate\n");
|
||||
Resize(aFinalSize->width, aFinalSize->height, true);
|
||||
|
||||
if (nsMenuPopupFrame* popupFrame = GetMenuPopupFrame(GetFrame())) {
|
||||
RefPtr<PresShell> presShell = popupFrame->PresShell();
|
||||
presShell->FrameNeedsReflow(popupFrame, IntrinsicDirty::Resize,
|
||||
NS_FRAME_IS_DIRTY);
|
||||
// Force to trigger popup crop to fit the screen
|
||||
popupFrame->SetPopupPosition(nullptr, true, false);
|
||||
}
|
||||
}
|
||||
if (needsPositionUpdate) {
|
||||
// See Bug 1735095
|
||||
// Font scale causes rounding errors which we can't handle by move-to-rect.
|
||||
|
|
@ -1897,15 +1926,13 @@ void nsWindow::NativeMoveResizeWaylandPopupCallback(
|
|||
LOG(" apply rounding error workaround, move to %d, %d", topLeft.x,
|
||||
topLeft.y);
|
||||
gtk_window_move(GTK_WINDOW(mShell), topLeft.x, topLeft.y);
|
||||
return;
|
||||
needsPositionUpdate = false;
|
||||
}
|
||||
}
|
||||
|
||||
LOG(" needPositionUpdate, new bounds [%d, %d]", newBounds.x, newBounds.y);
|
||||
mBounds.x = newBounds.x;
|
||||
mBounds.y = newBounds.y;
|
||||
NotifyWindowMoved(mBounds.x, mBounds.y);
|
||||
}
|
||||
|
||||
mBounds = newBounds;
|
||||
WaylandPopupPropagateChangesToLayout(needsPositionUpdate, needsSizeUpdate);
|
||||
}
|
||||
|
||||
static GdkGravity PopupAlignmentToGdkGravity(int8_t aAlignment) {
|
||||
|
|
@ -1997,12 +2024,7 @@ void nsWindow::WaylandPopupSetDirectPosition() {
|
|||
mBounds = LayoutDeviceIntRect(GdkPointToDevicePixels(mPopupPosition),
|
||||
mBounds.Size());
|
||||
LOG(" setting new bounds [%d, %d]\n", mBounds.x, mBounds.y);
|
||||
NotifyWindowMoved(mBounds.x, mBounds.y);
|
||||
if (nsMenuPopupFrame* popupFrame = GetMenuPopupFrame(GetFrame())) {
|
||||
auto p = CSSIntPoint::Round(
|
||||
mBounds.TopLeft() / popupFrame->PresContext()->CSSToDevPixelScale());
|
||||
popupFrame->MoveTo(p, true);
|
||||
}
|
||||
WaylandPopupPropagateChangesToLayout(/* move */ true, /* resize */ false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2354,14 +2376,16 @@ void nsWindow::WaylandPopupMove() {
|
|||
gtk_window_move(GTK_WINDOW(mShell), mRelativePopupPosition.x,
|
||||
mRelativePopupPosition.y);
|
||||
}
|
||||
// Notify layout about popup changes.
|
||||
WaylandPopupPropagateChangesToLayout(/* move */ true, /* resize */ false);
|
||||
return;
|
||||
}
|
||||
|
||||
// See https://gitlab.gnome.org/GNOME/gtk/-/issues/1986
|
||||
// We're likely fail to reposition already visible widget.
|
||||
if (gtk_widget_is_visible(mShell)) {
|
||||
NS_WARNING(
|
||||
"Positioning visible popup under Wayland, position may be wrong!");
|
||||
HideWaylandPopupWindow(/* aTemporaryHide */ true,
|
||||
/* aRemoveFromPopupList */ false);
|
||||
}
|
||||
|
||||
// Correct popup position now. It will be updated by gdk_window_move_to_rect()
|
||||
|
|
@ -5925,6 +5949,10 @@ void nsWindow::NativeMoveResize(bool aMoved, bool aResized) {
|
|||
LOG("nsWindow::NativeMoveResize move %d resize %d to %d,%d -> %d x %d\n",
|
||||
aMoved, aResized, rect.x, rect.y, rect.width, rect.height);
|
||||
|
||||
// We're going to reposition popup again co clear stored popup size from last
|
||||
// move-to-rect operation.
|
||||
MoveToRectPopupRectClear();
|
||||
|
||||
if (aResized && !AreBoundsSane()) {
|
||||
LOG(" bounds are insane, hidding the window");
|
||||
// We have been resized but to incorrect size.
|
||||
|
|
@ -6187,7 +6215,7 @@ void nsWindow::NativeShow(bool aAction) {
|
|||
} else {
|
||||
// There's a chance that when the popup will be shown again it might be
|
||||
// resized because parent could be moved meanwhile.
|
||||
mMoveToRectPopupRect = LayoutDeviceIntRect();
|
||||
MoveToRectPopupRectClear();
|
||||
LOG("nsWindow::NativeShow hide\n");
|
||||
if (GdkIsWaylandDisplay()) {
|
||||
if (IsWaylandPopup()) {
|
||||
|
|
|
|||
|
|
@ -795,6 +795,7 @@ class nsWindow final : public nsBaseWidget {
|
|||
void WaylandPopupSetDirectPosition();
|
||||
bool WaylandPopupFitsToplevelWindow();
|
||||
const WaylandPopupMoveToRectParams WaylandPopupGetPositionFromLayout();
|
||||
void WaylandPopupPropagateChangesToLayout(bool aMove, bool aResize);
|
||||
nsWindow* WaylandPopupFindLast(nsWindow* aPopup);
|
||||
GtkWindow* GetCurrentTopmostWindow();
|
||||
nsAutoCString GetFrameTag() const;
|
||||
|
|
@ -805,7 +806,7 @@ class nsWindow final : public nsBaseWidget {
|
|||
void LogPopupHierarchy();
|
||||
#endif
|
||||
|
||||
// mPopupPosition is the original popup position from layout, set by
|
||||
// mPopupPosition is the original popup position/size from layout, set by
|
||||
// nsWindow::Move() or nsWindow::Resize().
|
||||
// Popup position is relative to main (toplevel) window.
|
||||
GdkPoint mPopupPosition{};
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче