diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-08-14 20:23:15 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-08-14 20:23:15 +0300 |
commit | 3fc421539bc81f27262b91554694509f3e47f865 (patch) | |
tree | b191e1de4932ddcd3fad4a6780d0308f79d68e5e /src/gui/widgets | |
parent | 6a763f58ad8ab52b9b444b096a8f298d440e0a65 (diff) | |
download | mv-3fc421539bc81f27262b91554694509f3e47f865.tar.gz mv-3fc421539bc81f27262b91554694509f3e47f865.tar.bz2 mv-3fc421539bc81f27262b91554694509f3e47f865.tar.xz mv-3fc421539bc81f27262b91554694509f3e47f865.zip |
Show cast type in skill popup from custom place.
For skill shortcuts for now it always "Default".
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 10 | ||||
-rw-r--r-- | src/gui/widgets/skilllistbox.h | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 9604d33d8..7b6df7644 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -594,8 +594,16 @@ void ItemShortcutContainer::mouseMoved(MouseEvent &event) if (!skill) return; + // +++ for now from data only get cast type + const std::string data = selShortcut->getItemData(index); + CastTypeT castType = CastType::Default; + if (!data.empty()) + { + castType = static_cast<CastTypeT>(atoi(data.c_str())); + } skillPopup->show(skill, - toInt(itemColor, int)); + toInt(itemColor, int), + castType); skillPopup->position(viewport->mMouseX, viewport->mMouseY); } diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h index 818dbf8cb..533d12b5e 100644 --- a/src/gui/widgets/skilllistbox.h +++ b/src/gui/widgets/skilllistbox.h @@ -200,7 +200,8 @@ class SkillListBox final : public ListBox if (!skill) return; skillPopup->show(skill, - skill->customSelectedLevel); + skill->customSelectedLevel, + skill->customCastType); skillPopup->position(viewport->mMouseX, viewport->mMouseY); } |