From 9a50b90628eb61e1e48db35a36e9ad5c2a9a2bd5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 22 Nov 2015 21:58:33 +0300 Subject: Show selected and max skill levels in skill popup. --- src/gui/widgets/itemshortcutcontainer.cpp | 9 ++++++--- src/gui/widgets/skilllistbox.h | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/gui/widgets') 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 -- cgit v1.2.3-60-g2f50