josh/jui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement was_clicked state for rect input listener.

Browse Source
This commit is contained in:
scientiist
2023-10-09 18:23:13 -05:00
parent 1ddc00a8fb
commit 938f078ac6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/JUI/Widgets/Rect.hpp
View File

@@ -93,6 +93,7 @@ namespace JUI {
float border_radius = 0; // Curves the rectangle corners by n degrees
MouseButtonState prev_state{false, false, false};
bool was_clicked = false;
private:
bool mouse_hover = false;
#pragma endregion

19
src/JUI/Widgets/Rect.cpp
View File

@@ -87,11 +87,7 @@ namespace JUI {
}
//SDL_RenderDrawRect(target, &box);
// Debug Draw
std::string data = fmt::format("[{}, {}]", Round(abs_pos.x, 2), Round(abs_pos.y, 2));
//FC_DrawAlign(JUI::debug_font.fc_font, target, abs_pos.X, abs_pos.Y, FC_ALIGN_LEFT, data.c_str());
data = "";
@@ -103,9 +99,6 @@ namespace JUI {
SDL_RenderSetClipRect(target, old_clip);
}
void Rect::Update(double delta)
{
Widget::Update(delta);
@@ -128,27 +121,33 @@ namespace JUI {
if (!prev_state.LMB && state.LMB && mouse_hover) {
was_clicked = true;
MousePressed.Invoke(MouseButtonID::LMB);
}
if (prev_state.LMB && !state.LMB) {
if (prev_state.LMB && !state.LMB && was_clicked) {
MouseReleased.Invoke(MouseButtonID::LMB);
was_clicked = false;
}
if (!prev_state.RMB && state.RMB && mouse_hover) {
was_clicked = true;
MousePressed.Invoke(MouseButtonID::RMB);
}
if (prev_state.RMB && !state.RMB) {
if (prev_state.RMB && !state.RMB && was_clicked) {
MouseReleased.Invoke(MouseButtonID::RMB);
was_clicked = false;
}
if (!prev_state.MMB && state.MMB && mouse_hover) {
was_clicked = true;
MousePressed.Invoke(MouseButtonID::MMB);
}
if (prev_state.MMB && !state.MMB) {
if (prev_state.MMB && !state.MMB && was_clicked) {
MouseReleased.Invoke(MouseButtonID::MMB);
was_clicked = false;
}
if (drag)