mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: update 10-x-y to 85.0.4161.2 * Update patches * chore: SetHostCleanupFinalizationGroupCallback has been removed from V8 (cherry picked from commit7aa3058829) * Window Placement: Gate cross-screen fullscreen behavior on permission https://chromium-review.googlesource.com/c/chromium/src/+/2203268 (cherry picked from commitfdccae9246) * refactor: GetSublabelAt => GetSecondaryLabelAt (cherry picked from commitcc8be2f634) * refactor: use WebInputEvent::Namespace types directly Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2160523 (cherry picked from commitf35200077e) * refactor: service_manager::BinderMapWithContext merged into mojo::BinderMap Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2174654 (cherry picked from commitc2a4d1b515) * remove WebContentsView::SizeContents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2188931 (cherry picked from commitf4ccf3556c) * adapt to //content creating NetworkContexts https://chromium-review.googlesource.com/c/chromium/src/+/2195196 (cherry picked from commit6834366747) * Use a normal return value for WebContentsView::GetContainerBounds. https://chromium-review.googlesource.com/c/chromium/src/+/2212481 (cherry picked from commit68c8ea6ea9) * fixup patch * refactor: AddNewContents now takes a target_url Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2167732 (cherry picked from commit69fe1f6f47) * refactor: FollowRedirect takes in cors exempt headers now Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2129787 (cherry picked from commit58f3770c19) * refactor: printing::DuplexMode moved to mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2162388 (cherry picked from commita14cdc465a) * refactor: use MessagePortDescriptor instead of raw mojo::MessagePipeHandles Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1952124 (cherry picked from commitdce81ad06f) * refactor: cursor.mojom and cursor_types.mojom moved to //ui/base/cursor/mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172874 (cherry picked from commit7f3c13de3f) * refactor: shuttle cursor changed event to WebContentsObserver Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 (cherry picked from commit2f3a23afb7) Co-Authored-By: loc <loc@users.noreply.github.com> * chore: unused argument removed from ReadAvailableTypes in ui::Clipboard Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2173666 (cherry picked from commitd9152c3668) * remove ClientSideDetectionService from browser_process Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2175320 (cherry picked from commit2461522752) * Remove cors_exempt_headers.h https://chromium-review.googlesource.com/c/chromium/src/+/2203759 (cherry picked from commitb73faa6411) * [content] Remove unused methods from WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2199113 (cherry picked from commit8b9ea9cd2b) * Unnest CanonicalCookie::CookieInclusionStatus https://chromium-review.googlesource.com/c/chromium/src/+/2203171 (cherry picked from commit7d4349b37c) * WebContentsObserver now implements OnRendererResponsive https://chromium-review.googlesource.com/c/chromium/src/+/2211066 (cherry picked from commit53f32b7e45) * chore: remove NOTIFICATION_EXTENSIONS_READY_DEPRECATED Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2199874 (cherry picked from commit7914445469) * Supply speech recognition sandbox from service_sandbox_type.h https://chromium-review.googlesource.com/c/chromium/src/+/2206918 (cherry picked from commitf15a0fdfab) * [XProto] Replace XAtom with x11::Atom https://chromium-review.googlesource.com/c/chromium/src/+/2202789 (cherry picked from commit143110105a) * update print-to-pdf.html with latest html data https://bugs.chromium.org/p/chromium/issues/detail?id=1085667 (cherry picked from commit205105fc16) * fix build on windows (cherry picked from commit0a255c4fa7) * [printing] Mojofy PrintHostMsg_CheckForCancel https://chromium-review.googlesource.com/c/chromium/src/+/2212181 (cherry picked from commit4f1064afa9) * chore: update sysroots (cherry picked from commit2a1b78a4bf) * chore: DesktopWindowTreeHostLinux becomes DesktopWindowTreeHostPlatform Refs: (cherry picked from commit3fd0875d3d) * refactor: LogErrorEventDescription moved from ui to x11 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2164245 (cherry picked from commit9291fc4afc) * fix: inherit base network context params (cherry picked from commit698c66f7f9) * fix: use message handle api specific to embedders (cherry picked from commit23d01dc8e0) * chore: update v8 headers (cherry picked from commit81bc1e0bee) * add checkout_pgo_profiles to DEPS (cherry picked from commit9b73e6935c) * refactor: use newly mojo-ified PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> (cherry picked from commitde074ce23a) * [printing] Mojofy PrintHostMsg_PrintPreviewCancelled https://chromium-review.googlesource.com/c/chromium/src/+/2198331 (cherry picked from commit7bd8a6a576) * [printing] Mojofy PrintHostMsg_PrintPreviewInvalidPrinterSettings https://chromium-review.googlesource.com/c/chromium/src/+/2200556 (cherry picked from commitdd68ba1ecf) * Network service: Remove primary_network_context bool. https://chromium-review.googlesource.com/c/chromium/src/+/2204678 (cherry picked from commit6a0e8e5bf9) * [printing] Move PrintHostMsg_DidPrintContent_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2212110 (cherry picked from commita6a3291d9a) * [XProto] Move items from ::x11::XProto to ::x11 https://chromium-review.googlesource.com/c/chromium/src/+/2218476 (cherry picked from commitb16c48830a) * Update patches * Remove no longer needed patch * update patches * update patches Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: loc <loc@users.noreply.github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org>
110 lines
2.8 KiB
C++
110 lines
2.8 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <string>
|
|
|
|
#include "shell/common/mouse_util.h"
|
|
#include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"
|
|
|
|
using Cursor = ui::mojom::CursorType;
|
|
|
|
namespace electron {
|
|
|
|
std::string CursorTypeToString(const ui::Cursor& cursor) {
|
|
switch (cursor.type()) {
|
|
case Cursor::kPointer:
|
|
return "default";
|
|
case Cursor::kCross:
|
|
return "crosshair";
|
|
case Cursor::kHand:
|
|
return "pointer";
|
|
case Cursor::kIBeam:
|
|
return "text";
|
|
case Cursor::kWait:
|
|
return "wait";
|
|
case Cursor::kHelp:
|
|
return "help";
|
|
case Cursor::kEastResize:
|
|
return "e-resize";
|
|
case Cursor::kNorthResize:
|
|
return "n-resize";
|
|
case Cursor::kNorthEastResize:
|
|
return "ne-resize";
|
|
case Cursor::kNorthWestResize:
|
|
return "nw-resize";
|
|
case Cursor::kSouthResize:
|
|
return "s-resize";
|
|
case Cursor::kSouthEastResize:
|
|
return "se-resize";
|
|
case Cursor::kSouthWestResize:
|
|
return "sw-resize";
|
|
case Cursor::kWestResize:
|
|
return "w-resize";
|
|
case Cursor::kNorthSouthResize:
|
|
return "ns-resize";
|
|
case Cursor::kEastWestResize:
|
|
return "ew-resize";
|
|
case Cursor::kNorthEastSouthWestResize:
|
|
return "nesw-resize";
|
|
case Cursor::kNorthWestSouthEastResize:
|
|
return "nwse-resize";
|
|
case Cursor::kColumnResize:
|
|
return "col-resize";
|
|
case Cursor::kRowResize:
|
|
return "row-resize";
|
|
case Cursor::kMiddlePanning:
|
|
return "m-panning";
|
|
case Cursor::kEastPanning:
|
|
return "e-panning";
|
|
case Cursor::kNorthPanning:
|
|
return "n-panning";
|
|
case Cursor::kNorthEastPanning:
|
|
return "ne-panning";
|
|
case Cursor::kNorthWestPanning:
|
|
return "nw-panning";
|
|
case Cursor::kSouthPanning:
|
|
return "s-panning";
|
|
case Cursor::kSouthEastPanning:
|
|
return "se-panning";
|
|
case Cursor::kSouthWestPanning:
|
|
return "sw-panning";
|
|
case Cursor::kWestPanning:
|
|
return "w-panning";
|
|
case Cursor::kMove:
|
|
return "move";
|
|
case Cursor::kVerticalText:
|
|
return "vertical-text";
|
|
case Cursor::kCell:
|
|
return "cell";
|
|
case Cursor::kContextMenu:
|
|
return "context-menu";
|
|
case Cursor::kAlias:
|
|
return "alias";
|
|
case Cursor::kProgress:
|
|
return "progress";
|
|
case Cursor::kNoDrop:
|
|
return "nodrop";
|
|
case Cursor::kCopy:
|
|
return "copy";
|
|
case Cursor::kNone:
|
|
return "none";
|
|
case Cursor::kNotAllowed:
|
|
return "not-allowed";
|
|
case Cursor::kZoomIn:
|
|
return "zoom-in";
|
|
case Cursor::kZoomOut:
|
|
return "zoom-out";
|
|
case Cursor::kGrab:
|
|
return "grab";
|
|
case Cursor::kGrabbing:
|
|
return "grabbing";
|
|
case Cursor::kCustom:
|
|
return "custom";
|
|
default:
|
|
return "default";
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|