games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Replaced isMouseButtonPressed with isMouseLeftButtonPressed

Browse Source
This commit is contained in:
Ivan Savenko 2023-06-13 19:27:43 +03:00
parent 82288996a2
commit 8ad577255f
7 changed files with 13 additions and 13 deletions

2
client/adventureMap/CMinimap.cpp

@ -164,7 +164,7 @@ void CMinimap::hover(bool on)
void CMinimap::mouseMoved(const Point & cursorPosition)
{
if(isMouseButtonPressed(MouseButton::LEFT))
if(isMouseLeftButtonPressed())
moveAdvMapSelection(cursorPosition);
}

2
client/battle/BattleInterfaceClasses.cpp

@ -692,7 +692,7 @@ std::optional<uint32_t> StackQueue::getHoveredUnitIdIfAny() const
{
for(const auto & stackBox : stackBoxes)
{
if(stackBox->isHovered() || stackBox->isMouseButtonPressed(MouseButton::RIGHT))
if(stackBox->isHovered())
{
return stackBox->getBoundUnitID();
}

6
client/gui/EventDispatcher.cpp

@ -175,15 +175,15 @@ void EventDispatcher::handleLeftButtonClick(bool isPressed)
if(!vstd::contains(lclickable, i))
continue;
auto prev = i->isMouseButtonPressed(MouseButton::LEFT);
auto prev = i->isMouseLeftButtonPressed();
if(!isPressed)
i->currentMouseState[MouseButton::LEFT] = isPressed;
i->mouseClickedState = isPressed;
if( i->receiveEvent(GH.getCursorPosition(), AEventsReceiver::LCLICK))
{
if(isPressed)
i->currentMouseState[MouseButton::LEFT] = isPressed;
i->mouseClickedState = isPressed;
i->clickLeft(isPressed, prev);
}
else if(!isPressed)

5
client/gui/EventsReceiver.cpp

@ -18,6 +18,7 @@ AEventsReceiver::AEventsReceiver()
: activeState(0)
, hoveredState(false)
, panningState(false)
, mouseClickedState(false)
{
}
@ -36,9 +37,9 @@ bool AEventsReceiver::isActive() const
return activeState;
}
bool AEventsReceiver::isMouseButtonPressed(MouseButton btn) const
bool AEventsReceiver::isMouseLeftButtonPressed() const
{
return currentMouseState.count(btn) ? currentMouseState.at(btn) : false;
return mouseClickedState;
}
void AEventsReceiver::activateEvents(ui16 what)

7
client/gui/EventsReceiver.h

@ -14,7 +14,6 @@ class Point;
VCMI_LIB_NAMESPACE_END
class EventDispatcher;
enum class MouseButton;
enum class EShortcut;
using boost::logic::tribool;
@ -24,10 +23,10 @@ class AEventsReceiver
{
friend class EventDispatcher;
std::map<MouseButton, bool> currentMouseState;
ui16 activeState;
bool hoveredState;
bool panningState;
bool mouseClickedState;
protected:
/// Activates particular events for this UI element. Uses unnamed enum from this class
@ -82,6 +81,6 @@ public:
/// Returns true if element is currently active and may receive events
bool isActive() const;
/// Returns true if particular mouse button was pressed when inside this element
bool isMouseButtonPressed(MouseButton btn) const;
/// Returns true if left mouse button was pressed when inside this element
bool isMouseLeftButtonPressed() const;
};

2
client/lobby/RandomMapTab.cpp

@ -474,7 +474,7 @@ void TemplatesDropBox::clickLeft(tribool down, bool previousState)
auto w = widget<CSlider>("slider");
// pop the interface only if the mouse is not clicking on the slider
if (!w || !w->isMouseButtonPressed(MouseButton::LEFT))
if (!w || !w->isMouseLeftButtonPressed())
{
assert(GH.windows().isTopWindow(this));
GH.windows().popWindows(1);

2
client/widgets/Slider.cpp

@ -142,7 +142,7 @@ void CSlider::clickLeft(tribool down, bool previousState)
return;
// if (rw>1) return;
// if (rw<0) return;
slider->clickLeft(true, slider->isMouseButtonPressed(MouseButton::LEFT));
slider->clickLeft(true, slider->isMouseLeftButtonPressed());
scrollTo((int)(rw * positions + 0.5));
return;
}