mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-03-27 09:03:51 +00:00
feat: track mouseover on party frames; fix /cast !spell; update macro editor hint
This commit is contained in:
parent
7967bfdcb1
commit
28d7d3ec00
1 changed files with 8 additions and 1 deletions
|
|
@ -6363,6 +6363,9 @@ void GameScreen::sendChatMessage(game::GameHandler& gameHandler) {
|
||||||
while (!spellArg.empty() && spellArg.back() == ' ') spellArg.pop_back();
|
while (!spellArg.empty() && spellArg.back() == ' ') spellArg.pop_back();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Strip leading '!' (WoW /cast !Spell forces recast without toggling off)
|
||||||
|
if (!spellArg.empty() && spellArg.front() == '!') spellArg.erase(spellArg.begin());
|
||||||
|
|
||||||
// Support numeric spell ID: /cast 133 or /cast #133
|
// Support numeric spell ID: /cast 133 or /cast #133
|
||||||
{
|
{
|
||||||
std::string numStr = spellArg;
|
std::string numStr = spellArg;
|
||||||
|
|
@ -8227,7 +8230,7 @@ void GameScreen::renderActionBar(game::GameHandler& gameHandler) {
|
||||||
}
|
}
|
||||||
if (ImGui::BeginPopupModal("Edit Macro###MacroEdit", nullptr,
|
if (ImGui::BeginPopupModal("Edit Macro###MacroEdit", nullptr,
|
||||||
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse)) {
|
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse)) {
|
||||||
ImGui::Text("Macro #%u (first line executes on click)", macroEditorId_);
|
ImGui::Text("Macro #%u (all lines execute; [cond] Spell; Default supported)", macroEditorId_);
|
||||||
ImGui::SetNextItemWidth(320.0f);
|
ImGui::SetNextItemWidth(320.0f);
|
||||||
ImGui::InputTextMultiline("##MacroText", macroEditorBuf_, sizeof(macroEditorBuf_),
|
ImGui::InputTextMultiline("##MacroText", macroEditorBuf_, sizeof(macroEditorBuf_),
|
||||||
ImVec2(320.0f, 80.0f));
|
ImVec2(320.0f, 80.0f));
|
||||||
|
|
@ -10876,6 +10879,10 @@ void GameScreen::renderPartyFrames(game::GameHandler& gameHandler) {
|
||||||
if (ImGui::Selectable(label.c_str(), gameHandler.getTargetGuid() == member.guid)) {
|
if (ImGui::Selectable(label.c_str(), gameHandler.getTargetGuid() == member.guid)) {
|
||||||
gameHandler.setTarget(member.guid);
|
gameHandler.setTarget(member.guid);
|
||||||
}
|
}
|
||||||
|
// Set mouseover for [target=mouseover] macro conditionals
|
||||||
|
if (ImGui::IsItemHovered()) {
|
||||||
|
gameHandler.setMouseoverGuid(member.guid);
|
||||||
|
}
|
||||||
// Zone tooltip on name hover
|
// Zone tooltip on name hover
|
||||||
if (ImGui::IsItemHovered() && member.hasPartyStats && member.zoneId != 0) {
|
if (ImGui::IsItemHovered() && member.hasPartyStats && member.zoneId != 0) {
|
||||||
std::string zoneName = gameHandler.getWhoAreaName(member.zoneId);
|
std::string zoneName = gameHandler.getWhoAreaName(member.zoneId);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue