github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace content::CursorInfo with ui::Cursor

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/1999201
This commit is contained in:
John Kleinschmidt
2020-03-11 16:55:33 -04:00
parent 34350db4bd
commit 6b3b850692
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
shell/browser/api/electron_api_web_contents.cc
View File

@@ -2337,17 +2337,18 @@ bool WebContents::IsBeingCaptured() {
return web_contents()->IsBeingCaptured();
}
void WebContents::OnCursorChange(const content::WebCursor& cursor) {
const content::CursorInfo& info = cursor.info();
void WebContents::OnCursorChange(const content::WebCursor& webcursor) {
const ui::Cursor& cursor = webcursor.cursor();
if (info.type == ui::mojom::CursorType::kCustom) {
Emit("cursor-changed", CursorTypeToString(info),
gfx::Image::CreateFrom1xBitmap(info.custom_image),
info.image_scale_factor,
gfx::Size(info.custom_image.width(), info.custom_image.height()),
info.hotspot);
if (cursor.type() == ui::mojom::CursorType::kCustom) {
Emit("cursor-changed", CursorTypeToString(cursor),
gfx::Image::CreateFrom1xBitmap(cursor.custom_bitmap()),
cursor.image_scale_factor(),
gfx::Size(cursor.custom_bitmap().width(),
cursor.custom_bitmap().height()),
cursor.custom_hotspot());
} else {
Emit("cursor-changed", CursorTypeToString(info));
Emit("cursor-changed", CursorTypeToString(cursor));
}
}

4
shell/common/mouse_util.cc
View File

@@ -11,8 +11,8 @@ using Cursor = ui::mojom::CursorType;
namespace electron {
std::string CursorTypeToString(const content::CursorInfo& info) {
switch (info.type) {
std::string CursorTypeToString(const ui::Cursor& cursor) {
switch (cursor.type()) {
case Cursor::kPointer:
return "default";
case Cursor::kCross:

2
shell/common/mouse_util.h
View File

@@ -27,7 +27,7 @@
namespace electron {
// Returns the cursor's type as a string.
std::string CursorTypeToString(const content::CursorInfo& info);
std::string CursorTypeToString(const ui::Cursor& cursor);
} // namespace electron