summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-27 22:52:00 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-27 23:08:54 +0300
commit5cde118ec848cc9053a3a502daeecb417c8cfc18 (patch)
tree03b4bf837fcd74e7d21765f304dab936bd627bf9 /indra/media_plugins
parente5136cd19b38d45854d9fc69ca05b6a4c89b0394 (diff)
SL-14664 Added zoomout and sizeall
Remade code to use getCursorFromString
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp42
1 files changed, 23 insertions, 19 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 7f3c159caa..d5bfd7eda0 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -383,43 +383,46 @@ void MediaPluginCEF::onCursorChangedCallback(dullahan::ECursorType type)
switch (type)
{
- case dullahan::CT_POINTER:
- name = "arrow";
- break;
+ case dullahan::CT_POINTER:
+ name = "UI_CURSOR_ARROW";
+ break;
case dullahan::CT_CROSS:
- name = "cross";
+ name = "UI_CURSOR_CROSS";
break;
case dullahan::CT_HAND:
- name = "hand";
+ name = "UI_CURSOR_HAND";
break;
case dullahan::CT_IBEAM:
- name = "ibeam";
+ name = "UI_CURSOR_IBEAM";
break;
case dullahan::CT_WAIT:
- name = "wait";
+ name = "UI_CURSOR_WAIT";
break;
//case dullahan::CT_HELP:
case dullahan::CT_ROWRESIZE:
case dullahan::CT_NORTHRESIZE:
case dullahan::CT_SOUTHRESIZE:
case dullahan::CT_NORTHSOUTHRESIZE:
- name = "split_ns";
+ name = "UI_CURSOR_SIZENS";
break;
case dullahan::CT_COLUMNRESIZE:
case dullahan::CT_EASTRESIZE:
case dullahan::CT_WESTRESIZE:
case dullahan::CT_EASTWESTRESIZE:
- name = "split_we";
+ name = "UI_CURSOR_SIZEWE";
break;
case dullahan::CT_NORTHEASTRESIZE:
case dullahan::CT_SOUTHWESTRESIZE:
case dullahan::CT_NORTHEASTSOUTHWESTRESIZE:
- name = "split_nesw";
+ name = "UI_CURSOR_SIZENESW";
break;
case dullahan::CT_SOUTHEASTRESIZE:
case dullahan::CT_NORTHWESTRESIZE:
case dullahan::CT_NORTHWESTSOUTHEASTRESIZE:
- name = "split_nwse";
+ name = "UI_CURSOR_SIZENWSE";
+ break;
+ case dullahan::CT_MOVE:
+ name = "UI_CURSOR_SIZEALL";
break;
//case dullahan::CT_MIDDLEPANNING:
//case dullahan::CT_EASTPANNING:
@@ -430,32 +433,33 @@ void MediaPluginCEF::onCursorChangedCallback(dullahan::ECursorType type)
//case dullahan::CT_SOUTHEASTPANNING:
//case dullahan::CT_SOUTHWESTPANNING:
//case dullahan::CT_WESTPANNING:
- //case dullahan::CT_MOVE:
//case dullahan::CT_VERTICALTEXT:
//case dullahan::CT_CELL:
//case dullahan::CT_CONTEXTMENU:
case dullahan::CT_ALIAS:
- name = "tool_media_open";
+ name = "UI_CURSOR_TOOLMEDIAOPEN";
break;
case dullahan::CT_PROGRESS:
- name = "working";
+ name = "UI_CURSOR_WORKING";
break;
case dullahan::CT_COPY:
- name = "arrow_copy";
+ name = "UI_CURSOR_ARROWCOPY";
break;
case dullahan::CT_NONE:
- name = "cursor_no";
+ name = "UI_CURSOR_NO";
break;
case dullahan::CT_NODROP:
case dullahan::CT_NOTALLOWED:
- name = "cursor_no_locked";
+ name = "UI_CURSOR_NOLOCKED";
break;
case dullahan::CT_ZOOMIN:
+ name = "UI_CURSOR_TOOLZOOMIN";
+ break;
case dullahan::CT_ZOOMOUT:
- name = "tool_zoomin";
+ name = "UI_CURSOR_TOOLZOOMOUT";
break;
case dullahan::CT_GRAB:
- name = "tool_grab";
+ name = "UI_CURSOR_TOOLGRAB";
break;
//case dullahan::CT_GRABING:
//case dullahan::CT_CUSTOM: