Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the mouse interaction in the Editor's spell selection and castle properties windows #9357

Merged
merged 7 commits into from
Dec 22, 2024
Merged

Fix the mouse interaction in the Editor's spell selection and castle properties windows #9357

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11ce8ec
Fix the mouse interaction in the Editor's Spell selection window
oleg-derevenetz Dec 19, 2024
341e917
Move the assertion
oleg-derevenetz Dec 19, 2024
61099b0
Fix the castle window
oleg-derevenetz Dec 20, 2024
d9b340b
Fix the build on ARM64
oleg-derevenetz Dec 20, 2024
5e89616
Revert "Fix the build on ARM64"
oleg-derevenetz Dec 20, 2024
a3f9472
Merge branch master into editor-spell-selection-mouse-fix
oleg-derevenetz Dec 21, 2024
927547f
Merge branch master into editor-spell-selection-mouse-fix
oleg-derevenetz Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/fheroes2/editor/editor_spell_selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,17 @@ namespace
return false;
}

if ( eventProcessor.MouseClickLeft() ) {
assert( static_cast<size_t>( spellIndex ) < _spellRoi.size() );
assert( static_cast<size_t>( spellIndex ) < _spellRoi.size() );

const fheroes2::Rect spellRoi = _spellRoi[spellIndex];
Districh-ru marked this conversation as resolved.
Show resolved Hide resolved

if ( eventProcessor.MouseClickLeft( spellRoi ) ) {
_spells[spellIndex].second = !_spells[spellIndex].second;

return true;
}

if ( eventProcessor.isMouseRightButtonPressed() ) {
if ( eventProcessor.isMouseRightButtonPressedInArea( spellRoi ) ) {
fheroes2::SpellDialogElement( _spells[spellIndex].first, nullptr ).showPopup( Dialog::ZERO );
}

Expand Down
Loading