diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:12 +0000 |
| commit | a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431 (patch) | |
| tree | 54617b4f5f04ee87a2c9e3b97cc88b8626859124 /widget/cocoa | |
| parent | Releasing progress-linux version 115.7.0esr-1~deb12u1progress7u1. (diff) | |
| download | firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.tar.xz firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.zip | |
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/cocoa')
| -rw-r--r-- | widget/cocoa/nsChildView.mm | 8 | ||||
| -rw-r--r-- | widget/cocoa/nsCursorManager.h | 3 | ||||
| -rw-r--r-- | widget/cocoa/nsCursorManager.mm | 9 |
3 files changed, 14 insertions, 6 deletions
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 4f9e69f2b9..0968fc89eb 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -617,8 +617,12 @@ void nsChildView::SetCursor(const Cursor& aCursor) { nsBaseWidget::SetCursor(aCursor); - if (NS_SUCCEEDED([[nsCursorManager sharedInstance] setCustomCursor:aCursor - widgetScaleFactor:BackingScaleFactor()])) { + bool forceUpdate = mUpdateCursor; + mUpdateCursor = false; + if (mCustomCursorAllowed && NS_SUCCEEDED([[nsCursorManager sharedInstance] + setCustomCursor:aCursor + widgetScaleFactor:BackingScaleFactor() + forceUpdate:forceUpdate])) { return; } diff --git a/widget/cocoa/nsCursorManager.h b/widget/cocoa/nsCursorManager.h index c36d8962fb..f3acbb68e9 100644 --- a/widget/cocoa/nsCursorManager.h +++ b/widget/cocoa/nsCursorManager.h @@ -35,7 +35,8 @@ // As above, but returns an error if the cursor isn't custom or we couldn't set // it for some reason. - (nsresult)setCustomCursor:(const nsIWidget::Cursor&)aCursor - widgetScaleFactor:(CGFloat)aWidgetScaleFactor; + widgetScaleFactor:(CGFloat)aWidgetScaleFactor + forceUpdate:(bool)aForceUpdate; /*! @method sharedInstance @abstract Get the Singleton instance of the cursor manager. diff --git a/widget/cocoa/nsCursorManager.mm b/widget/cocoa/nsCursorManager.mm index 6596df25a3..e480f48da6 100644 --- a/widget/cocoa/nsCursorManager.mm +++ b/widget/cocoa/nsCursorManager.mm @@ -238,11 +238,14 @@ static constexpr nsCursor kCustomCursor = eCursorCount; } - (nsresult)setCustomCursor:(const nsIWidget::Cursor&)aCursor - widgetScaleFactor:(CGFloat)scaleFactor { + widgetScaleFactor:(CGFloat)scaleFactor + forceUpdate:(bool)aForceUpdate { NS_OBJC_BEGIN_TRY_BLOCK_RETURN; - // As the user moves the mouse, this gets called repeatedly with the same aCursorImage - if (sCurrentCursor == aCursor && sCurrentCursorScaleFactor == scaleFactor && mCurrentMacCursor) { + // As the user moves the mouse, this gets called repeatedly with the same + // aCursorImage + if (!aForceUpdate && sCurrentCursor == aCursor && + sCurrentCursorScaleFactor == scaleFactor && mCurrentMacCursor) { // Native dragging can unset our cursor apparently (see bug 1739352). if (MOZ_UNLIKELY(![mCurrentMacCursor isSet])) { [mCurrentMacCursor set]; |