diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-11-22 21:58:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-11-22 22:06:08 +0300 |
| commit | 9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5 (patch) | |
| tree | 24ab6a1f2e367a15e2ac9b994e7060767068b8e5 /src/gui/widgets | |
| parent | e3f651e65f5a486f47ae81fe3ba5e68e8c48f79e (diff) | |
| download | mv-9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5.tar.gz mv-9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5.tar.bz2 mv-9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5.tar.xz mv-9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5.zip | |
Show selected and max skill levels in skill popup.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 9 | ||||
| -rw-r--r-- | src/gui/widgets/skilllistbox.h | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index bfb8fef0d..e1f6bafee 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -576,7 +576,8 @@ void ItemShortcutContainer::mouseMoved(MouseEvent &event) if (spell && viewport) { spellPopup->setItem(spell); - spellPopup->view(viewport->mMouseX, viewport->mMouseY); + spellPopup->view(viewport->mMouseX, + viewport->mMouseY); } else { @@ -591,8 +592,10 @@ void ItemShortcutContainer::mouseMoved(MouseEvent &event) if (!skill) return; - skillPopup->show(skill); - skillPopup->position(viewport->mMouseX, viewport->mMouseY); + skillPopup->show(skill, + toInt(itemColor, int)); + skillPopup->position(viewport->mMouseX, + viewport->mMouseY); } } diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h index fcfeebe62..20cc8d885 100644 --- a/src/gui/widgets/skilllistbox.h +++ b/src/gui/widgets/skilllistbox.h @@ -197,8 +197,10 @@ class SkillListBox final : public ListBox const SkillInfo *const skill = getSkillByEvent(event); if (!skill) return; - skillPopup->show(skill); - skillPopup->position(viewport->mMouseX, viewport->mMouseY); + skillPopup->show(skill, + skill->selectedLevel); + skillPopup->position(viewport->mMouseX, + viewport->mMouseY); } void mouseDragged(MouseEvent &event) override final |